Junio C Hamano 50ac740801 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>

2006-04-19 15:37:36 -07:00

7.2 KiB

Executable File

Raw Blame History

View Raw