projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
HTTP cleanup
[git.git]
/
git-merge.sh
diff --git
a/git-merge.sh
b/git-merge.sh
index
78ab422
..
af1f25b
100755
(executable)
--- a/
git-merge.sh
+++ b/
git-merge.sh
@@
-55,8
+55,7
@@
finish () {
case "$no_summary" in
'')
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
}
;;
esac
}
@@
-335,5
+334,5
@@
Conflicts:
then
git-rerere
fi
then
git-rerere
fi
- die "Automatic merge failed; fix
up by hand
"
+ die "Automatic merge failed; fix
conflicts and then commit the result.
"
fi
fi