kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Junio C Hamano 2006-04-19 14:54:27 -07:00
parent 23edecbc9a
commit 50ac740801
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge.sh
View File

@ -335,5 +335,5 @@ Conflicts:
then then
git-rerere git-rerere
fi fi
die "Automatic merge failed; fix up by hand" die "Automatic merge failed; fix conflicts and then commit the result."
fi fi