Merge with gitk.

diff --git a/git-apply-patch-script b/git-apply-patch-script
index 13ec1c4490612f524f9b1070a57229cdc2c50aed..6261fd85f29f6ee1441e530978ccc5374271cc6e 100755 (executable)
--- a/git-apply-patch-script
+++ b/git-apply-patch-script
@@ -8,9 +8,12 @@
 #
 
 case "$#" in
-2)
+1)
     echo >&2 "cannot handle unmerged diff on path $1."
     exit 1 ;;
+8 | 9)
+    echo >&2 "cannot handle rename diff between $1 and $8 yet."
+    exit 1 ;;
 esac
 name="$1" tmp1="$2" hex1="$3" mode1="$4" tmp2="$5" hex2="$6" mode2="$7"