diff options
| -rwxr-xr-x | git-merge.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/git-merge.sh b/git-merge.sh index 0a158ef779..92e5a65cae 100755 --- 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 |