Skip to content

Commit

Permalink
merge script: tweak unmerged files message to match builtin
Browse files Browse the repository at this point in the history
Before:

	You are in the middle of a conflicted merge.

After:

	Merge is not possible because you have unmerged files.

I prefer the old message, but the new one is more consistent with
other commands and tests expect it.  In particular, without this
change the scripted merge does not pass t3030.

Based on v1.7.0-rc0~66^2 (Be more user-friendly when refusing to do
something because of conflict., 2010-01-12).

Cc: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jonathan Nieder authored and Junio C Hamano committed Aug 18, 2010
1 parent 22e0560 commit 64048d6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion contrib/examples/git-merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ require_work_tree
cd_to_toplevel

test -z "$(git ls-files -u)" ||
die "You are in the middle of a conflicted merge."
die "Merge is not possible because you have unmerged files."

LF='
'
Expand Down

0 comments on commit 64048d6

Please sign in to comment.