X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-merge-one-file-script;h=b791107fd73c87361f340fc1b0a43e53cecd2a8e;hb=80b52b0f9d04fa0b8863fef2beef937ee1a486ae;hp=be64c072862b5c5985fbe1495864b0c8d09391c0;hpb=638ccfdf0eeabf3d985426308b2a82db6207ae28;p=git.git

diff --git a/git-merge-one-file-script b/git-merge-one-file-script
index be64c072..b791107f 100755
--- 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 &&