From: Junio C Hamano <junkio@cox.net>
Date: Wed, 19 Apr 2006 21:54:27 +0000 (-0700)
Subject: git-merge: a bit more readable user guidance.
X-Git-Tag: v1.3.1~11
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=50ac7408018209a2829b7948119270fec7e14ec8;p=git.git

git-merge: a bit more readable user guidance.

We said "fix up by hand" after failed automerge, which was a big
"Huh?  Now what?".  Be a bit more explicit without being too
verbose. Suggested by Carl Worth.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-merge.sh b/git-merge.sh
index 78ab422e4..b834e79c9 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