X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-merge-one-file-script;h=be64c072862b5c5985fbe1495864b0c8d09391c0;hb=35cc4bcd10862db190df9685b7ad221f2a25404f;hp=88ad3edd64acf92dd11d690c110d42bef23a6187;hpb=5569bf9bbedd63a00780fc5c110e0cfab3aa97b9;p=git.git

diff --git a/git-merge-one-file-script b/git-merge-one-file-script
index 88ad3edd..be64c072 100755
--- a/git-merge-one-file-script
+++ b/git-merge-one-file-script
@@ -22,7 +22,9 @@ case "${1:-.}${2:-.}${3:-.}" in
 #
 "$1.." | "$1.$1" | "$1$1.")
 	echo "Removing $4"
-	rm -f -- "$4" &&
+	if test -f "$4"; then
+		rm -f -- "$4"
+	fi &&
 		exec git-update-cache --remove -- "$4"
 	;;
 
@@ -59,7 +61,7 @@ case "${1:-.}${2:-.}${3:-.}" in
 
 	# We reset the index to the first branch, making
 	# git-diff-file useful
-	git-update-cache --add --cacheinfo "$6" "$2" "$4" 
+	git-update-cache --add --cacheinfo "$6" "$2" "$4"
 		git-checkout-cache -u -f -- "$4" &&
 		merge "$4" "$orig" "$src2"
 	ret=$?