git-tar-tree: no more void pointer arithmetic

[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