X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-merge-one-file-script;h=9802f67032bde6bbd9edacb89f3a4acdf876deb9;hb=ad8c80a58f7bf8f7d5d34794355e5540cd7b3218;hp=88ad3edd64acf92dd11d690c110d42bef23a6187;hpb=98a96b00b88ee35866cd0b1e94697db76bd5ddf9;p=git.git

diff --git a/git-merge-one-file-script b/git-merge-one-file-script
index 88ad3edd..9802f670 100755
--- a/git-merge-one-file-script
+++ b/git-merge-one-file-script
@@ -22,8 +22,11 @@ case "${1:-.}${2:-.}${3:-.}" in
 #
 "$1.." | "$1.$1" | "$1$1.")
 	echo "Removing $4"
-	rm -f -- "$4" &&
-		exec git-update-cache --remove -- "$4"
+	if test -f "$4"
+	then
+		rm -f -- "$4"
+	fi &&
+	exec git-update-cache --remove -- "$4"
 	;;
 
 #