Merge with gitk.

diff --git a/git-apply-patch-script b/git-apply-patch-script
index 171c9f5f43abf7299e4b394a3787f97c726d1f6e..6261fd85f29f6ee1441e530978ccc5374271cc6e 100755 (executable)
--- a/git-apply-patch-script
+++ b/git-apply-patch-script
@@ -11,7 +11,7 @@ case "$#" in
 1)
     echo >&2 "cannot handle unmerged diff on path $1."
     exit 1 ;;
-8)
+8 | 9)
     echo >&2 "cannot handle rename diff between $1 and $8 yet."
     exit 1 ;;
 esac