Merge branch 'master' into next

diff --git a/git-merge.sh b/git-merge.sh
index 7be9e81f1f886c6e0b4c6be8758bd7ba25f5b04c..cc0952a97db7d998a3f26e98b93cf2154887abd5 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -131,7 +131,7 @@ case "$#,$common,$no_commit" in
        ;;
 1,"$head",*)
        # Again the most common case of merging one remote.
-       echo "Updating from $head to $1."
+       echo "Updating from $head to $1"
        git-update-index --refresh 2>/dev/null
        new_head=$(git-rev-parse --verify "$1^0") &&
        git-read-tree -u -v -m $head "$new_head" &&