Make sure we error out if we can't remove a file on automatic merges.

diff --git a/git-merge-one-file-script b/git-merge-one-file-script
index cf42ff63c2dd3b945d07a9a4532f26e253708558..787ac446930e311b345a05ff1006ab343fa5a471 100755 (executable)
--- a/git-merge-one-file-script
+++ b/git-merge-one-file-script
@@ -21,13 +21,14 @@ case "${1:-.}${2:-.}${3:-.}" in
 "$1..")
        echo "WARNING: $4 is removed in both branches."
        echo "WARNING: This is a potential rename conflict."
+       rm -f -- "$4" || exit 1
        exec git-update-cache --remove -- "$4" ;;
 #
 # Deleted in one and unchanged in the other.
 #
 "$1.." | "$1.$1" | "$1$1.")
        echo "Removing $4"
-       rm -f -- "$4"
+       rm -f -- "$4" || exit 1
        exec git-update-cache --remove -- "$4" ;;
 #
 # Added in one.