git-merge-cache -o does all the automerges in a single shot

[git.git] / git-apply-patch-script

diff --git a/git-apply-patch-script b/git-apply-patch-script
index 13ec1c4..0849a3e 100755 (executable)
--- 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