projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/git/gitweb
[git.git]
/
git-resolve.sh
diff --git
a/git-resolve.sh
b/git-resolve.sh
index
b53ede8
..
1c7aaef
100755
(executable)
--- a/
git-resolve.sh
+++ b/
git-resolve.sh
@@
-41,7
+41,7
@@
case "$common" in
exit 0
;;
"$head")
- echo "Updating from $head to $merge
.
"
+ echo "Updating from $head to $merge"
git-read-tree -u -m $head $merge || exit 1
git-update-ref HEAD "$merge" "$head"
git-diff-tree -p $head $merge | git-apply --stat