X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;h=b834e79c98af51a9f3ad4927a2d11c999349b0e4;hb=bdf0ef0824ecca427ec04ac047ffe4aaf73ace5a;hp=78ab422e4ef294d8bcffba91bb7e2116e381d98e;hpb=4c61b7d15a6215fa4dffa33c37c3ef9df80d3f67;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index 78ab422e..b834e79c 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -335,5 +335,5 @@ Conflicts:
 	then
 		git-rerere
 	fi
-	die "Automatic merge failed; fix up by hand"
+	die "Automatic merge failed; fix conflicts and then commit the result."
 fi