merge script: tweak unmerged files message to match builtin

diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh
index 72853cf7feecb67933a87ef153d0fddbe858a79f..99fe1f2594490f70b66cc4997cd03700f22b8a38 100755 (executable)
--- 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='
 '