diff --git a/git-merge.sh b/git-merge.sh
index 0a158ef779eb8717f27e632e31726f00586979ed..dc17baf6e0017b99f94fd9b462ce7243d1fbe0e0 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
do
echo $remote
done >"$GIT_DIR/MERGE_HEAD"
-echo $merge_msg >"$GIT_DIR/MERGE_MSG"
+echo "$merge_msg" >"$GIT_DIR/MERGE_MSG"
if test "$merge_was_ok" = t
then
"Automatic merge went well; stopped before committing as requested"
exit 0
else
+ {
+ echo '
+Conflicts:
+'
+ git ls-files --unmerged |
+ sed -e 's/^[^ ]* / /' |
+ uniq
+ } >>"$GIT_DIR/MERGE_MSG"
+ git rerere
die "Automatic merge failed; fix up by hand"
fi