X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-resolve.sh;h=1c7aaefa2528b73fea3eee22b086b94fa91854c5;hb=ae448e3854d8b6e7e37aa88fa3917f5dd97f3210;hp=b53ede8d87b7473fb5b5239228008be372797552;hpb=5be4eabf90a4f6d14d3ae16772e6b2e063d71587;p=git.git diff --git a/git-resolve.sh b/git-resolve.sh index b53ede8d..1c7aaefa 100755 --- 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