From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 8 Jun 2005 23:54:23 +0000 (-0700)
Subject: Merge my and Petr's git-merge-one-file-script modifications
X-Git-Tag: v0.99~300
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=566487c8a617c12d68bf22c7078bce0b94fc8121;p=git.git

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

566487c8a617c12d68bf22c7078bce0b94fc8121
diff --cc git-merge-one-file-script
index 73e1c50bf,787ac4469..f0353c14b
--- a/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.
  #