diff --git a/git-merge.sh b/git-merge.sh
index 78ab422e4ef294d8bcffba91bb7e2116e381d98e..af1f25b3c51d197ea5fd24b7623dfb591f867133 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
case "$no_summary" in
'')
- git-diff-tree -p -M "$head" "$1" |
- git-apply --stat --summary
+ git-diff-tree -p --stat --summary -M "$head" "$1"
;;
esac
}
then
git-rerere
fi
- die "Automatic merge failed; fix up by hand"
+ die "Automatic merge failed; fix conflicts and then commit the result."
fi