diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-19 14:54:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-19 15:37:36 -0700 |
| commit | 50ac7408018209a2829b7948119270fec7e14ec8 (patch) | |
| tree | 8e1ee8477575ce9f7891b6a47f01b7b4ffb66fba | |
| parent | 23edecbc9a5566ac5aa8fb251fbcf8bb83694837 (diff) | |
| download | git-50ac7408018209a2829b7948119270fec7e14ec8.tar.gz git-50ac7408018209a2829b7948119270fec7e14ec8.tar.xz | |
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>
| -rwxr-xr-x | git-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh index 78ab422e4..b834e79c9 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -335,5 +335,5 @@ Conflicts: then git-rerere fi - die "Automatic merge failed; fix up by hand" + die "Automatic merge failed; fix conflicts and then commit the result." fi |