X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge-one-file-script;h=f0353c14b4c116a07a4a2b67453707767e4a1a3f;hb=566487c8a617c12d68bf22c7078bce0b94fc8121;hp=73e1c50bffdcee20131baa3938677dc19cde4c71;hpb=ec73962d8e17e89ac0c4b21f07cefe16594e07a2;p=git.git

diff --git a/git-merge-one-file-script b/git-merge-one-file-script
index 73e1c50b..f0353c14 100755
--- a/git-merge-one-file-script
+++ b/git-merge-one-file-script
@@ -23,7 +23,8 @@ case "${1:-.}${2:-.}${3:-.}" in
 "$1..")
 	echo "WARNING: $4 is removed in both branches."
 	echo "WARNING: This is a potential rename conflict."
-	exec git-update-cache --remove -- "$4"
+	rm -f -- "$4" &&
+		exec git-update-cache --remove -- "$4"
 	;;
 
 #