summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-08-17 07:03:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-18 21:02:04 (GMT)
commit64048d670b4810125493ff0a2bab88cb12344e7f (patch)
tree085a6fe81340ca909937b8cab2d3eedb4d7339c0 /contrib/examples/git-merge.sh
parent22e0560a70f4b5bfbbf571647e03fa154a6d6bd1 (diff)
downloadgit-64048d670b4810125493ff0a2bab88cb12344e7f.zip
git-64048d670b4810125493ff0a2bab88cb12344e7f.tar.gz
git-64048d670b4810125493ff0a2bab88cb12344e7f.tar.bz2
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>
Diffstat (limited to 'contrib/examples/git-merge.sh')
-rwxr-xr-xcontrib/examples/git-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh
index 72853cf..99fe1f2 100755
--- a/contrib/examples/git-merge.sh
+++ b/contrib/examples/git-merge.sh
@@ -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='
'