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

2005-06-08 16:54:23 -07:00 · 2005-06-08 16:54:23 -07:00 · 566487c8a6
commit 566487c8a6
parent ec73962d8e ae3858e7e9
1 changed files with 2 additions and 1 deletions
--- a/3
+++ b/3
@ -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"
 	;;

 #