X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-resolve.sh;h=1c7aaefa2528b73fea3eee22b086b94fa91854c5;hb=fb6a9f93d39e4e5fdb83673a927f71a34e9fb7c0;hp=b53ede8d87b7473fb5b5239228008be372797552;hpb=207a1f3ce9894ad6fab59077b9cec1adc70ed6c5;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