projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix cpio call
[git.git]
/
git-merge.sh
diff --git
a/git-merge.sh
b/git-merge.sh
index
0a158ef
..
74f0761
100755
(executable)
--- a/
git-merge.sh
+++ b/
git-merge.sh
@@
-293,7
+293,7
@@
for remote
do
echo $remote
done >"$GIT_DIR/MERGE_HEAD"
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
if test "$merge_was_ok" = t
then
@@
-301,5
+301,17
@@
then
"Automatic merge went well; stopped before committing as requested"
exit 0
else
"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"
+ if test -d "$GIT_DIR/rr-cache"
+ then
+ git-rerere
+ fi
die "Automatic merge failed; fix up by hand"
fi
die "Automatic merge failed; fix up by hand"
fi