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

diff --cc git-merge-one-file-script
index 73e1c50,787ac44..f0353c1
--- 1/git-merge-one-file-script
--- 2/git-merge-one-file-script
+++ b/git-merge-one-file-script
@@@ -23,9 -21,8 +23,10 @@@ case "${1:-.}${2:-.}${3:-.}" i
  "$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" || exit 1
 -      exec git-update-cache --remove -- "$4" ;;
++      rm -f -- "$4" &&
++              exec git-update-cache --remove -- "$4"
 +      ;;
 +
  #
  # Deleted in one and unchanged in the other.
  #