merge script: tweak unmerged files message to match builtin
authorJonathan Nieder <jrnieder@gmail.com>
Tue, 17 Aug 2010 07:03:36 +0000 (02:03 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 21:02:04 +0000 (14:02 -0700)
commit64048d670b4810125493ff0a2bab88cb12344e7f
tree085a6fe81340ca909937b8cab2d3eedb4d7339c0
parent22e0560a70f4b5bfbbf571647e03fa154a6d6bd1
merge script: tweak unmerged files message to match builtin

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>
contrib/examples/git-merge.sh