diff options
| -rwxr-xr-x | git-merge.sh | 2 | ||||
| -rwxr-xr-x | git-resolve.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/git-merge.sh b/git-merge.sh index 7be9e81f1..cc0952a97 100755 --- 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" && diff --git a/git-resolve.sh b/git-resolve.sh index b53ede8d8..1c7aaefa2 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 |