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>
Junio C Hamano committed
Apr 19, 2006 at 14:54 UTC
50ac7408018209a2829b7948119270fec7e14ec8
1 file changed
+1
-1
git-merge.sh
+1
-1
@@ -335,5 +335,5 @@ Conflicts:
335
then
336
git-rerere
337
fi
338
- die "Automatic merge failed; fix up by hand"
338
+ die "Automatic merge failed; fix conflicts and then commit the result."
339
fi