Commits

Anonymous committed 50ac740

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>

  • Participants
  • Parent commits 23edecb

Comments (0)

Files changed (1)

 	then
 		git-rerere
 	fi
-	die "Automatic merge failed; fix up by hand"
+	die "Automatic merge failed; fix conflicts and then commit the result."
 fi