[PATCH] git-merge: a bit more readable user guidance.
- From
Junio C Hamano <junkio@cox.net>
- Date
- Apr 19, 2006, 21:59 UTC
- Message-ID
- <7vwtdl5irl.fsf_-_@assigned-by-dhcp.cox.net>
- In-Reply-To
- <7v8xq16y31.fsf@assigned-by-dhcp.cox.net>
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 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
aec8e89ca3d38f9d0d4d287d874e8b3859d68787
diff --git a/git-merge.sh b/git-merge.sh index 78ab422..b834e79 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
-- 1.3.0.g2c4a