Merge branch 'jc/clone' into next

diff --git a/git-resolve.sh b/git-resolve.sh
index b53ede8d87b7473fb5b5239228008be372797552..1c7aaefa2528b73fea3eee22b086b94fa91854c5 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