git-merge: a bit more readable user guidance.
commit50ac7408018209a2829b7948119270fec7e14ec8
authorJunio C Hamano <junkio@cox.net>
Wed, 19 Apr 2006 21:54:27 +0000 (19 14:54 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 19 Apr 2006 22:37:36 +0000 (19 15:37 -0700)
tree8e1ee8477575ce9f7891b6a47f01b7b4ffb66fba
parent23edecbc9a5566ac5aa8fb251fbcf8bb83694837
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>
git-merge.sh