Merge my and Petr's git-merge-one-file-script modifications

diff --git a/git-merge-one-file-script b/git-merge-one-file-script
index 73e1c50bffdcee20131baa3938677dc19cde4c71..f0353c14b4c116a07a4a2b67453707767e4a1a3f 100755 (executable)
--- 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"
        ;;
 
 #