git-cvsimport: Handle "Removed" from pserver

[git.git] / git-merge.sh

diff --git a/git-merge.sh b/git-merge.sh
index 78ab422..b834e79 100755 (executable)
--- 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