merge: seed the commit message with list of conflicted files.

The files with conflicts need to be hand resolved, and it is a
good discipline for the committer to explain which branch was
taken and why.  Pre-fill the merge message template with the
list of conflicted paths to encourage it.

This is from Linus.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-merge.sh b/git-merge.sh
index 0a158ef779eb8717f27e632e31726f00586979ed..92e5a65cae6ebe8d9f9eef71277240e3fbe72315 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -301,5 +301,13 @@ 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"
        die "Automatic merge failed; fix up by hand"
 fi