X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;h=3465041bc4c9b2512623ee6c06317ecb7689e528;hb=4eba0f3763e2f4bbf614c99ae3a5b299e8d61aff;hp=d12a2a93b1408e7be6e9947737b4b09c5f0927fe;hpb=79a9d8ea0d88a3667ad19be8e705405ab5d896f1;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index d12a2a93..3465041b 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -26,7 +26,7 @@ dropsave() {
 savestate() {
 	# Stash away any local modifications.
 	git-diff-index -r -z --name-only $head |
-	cpio -0 -o >"$GIR_DIR/MERGE_SAVE"
+	cpio -0 -o >"$GIT_DIR/MERGE_SAVE"
 }
 
 restorestate() {
@@ -103,7 +103,7 @@ echo "$head" >"$GIT_DIR/ORIG_HEAD"
 
 case "$#,$common" in
 *,'')
-	die "Unable to find common commit between $head_arg and $*"
+	# No common ancestors found. We need a real merge.
 	;;
 1,"$1")
 	# If head can reach all the merge then we are up to date.