Merge part of 'jc/cache-tree'

diff --git a/git-merge.sh b/git-merge.sh
index 78ab422e4ef294d8bcffba91bb7e2116e381d98e..b834e79c98af51a9f3ad4927a2d11c999349b0e4 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