From ae3858e7e9146208f1608445975e2761c9b0482e Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 8 Jun 2005 16:35:30 -0700
Subject: Make sure we error out if we can't remove a file on automatic merges.

Pointed out by Junio.

diff --git a/git-merge-one-file-script b/git-merge-one-file-script
index cf42ff6..787ac44 100755
--- 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.
-- 
cgit v0.10.2-6-g49f6