Merge refs/heads/master from .

diff --git a/git-merge-one-file-script b/git-merge-one-file-script
index be64c072862b5c5985fbe1495864b0c8d09391c0..b791107fd73c87361f340fc1b0a43e53cecd2a8e 100755 (executable)
--- a/git-merge-one-file-script
+++ b/git-merge-one-file-script
@@ -21,7 +21,9 @@ case "${1:-.}${2:-.}${3:-.}" in
 # Deleted in both or deleted in one and unchanged in the other
 #
 "$1.." | "$1.$1" | "$1$1.")
-       echo "Removing $4"
+       if [ "$2" ]; then
+               echo "Removing $4"
+       fi
        if test -f "$4"; then
                rm -f -- "$4"
        fi &&