X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-apply-patch-script;h=0849a3e68b3a219aa41e3357fd71fb39b285e059;hb=2ecd90502f4615c4f1a9340dfaed3f78ecd23747;hp=13ec1c4490612f524f9b1070a57229cdc2c50aed;hpb=fc54a9c30ccad3fde5890d2c0ca2e2acc0848fbc;p=git.git diff --git a/git-apply-patch-script b/git-apply-patch-script index 13ec1c44..0849a3e6 100755 --- a/git-apply-patch-script +++ b/git-apply-patch-script @@ -8,7 +8,7 @@ # case "$#" in -2) +1) echo >&2 "cannot handle unmerged diff on path $1." exit 1 ;; esac