[PATCH] Use git-merge-file in git-merge-one-file, too

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Dec 22, 2006, 02:20 UTC
Message-ID: <Pine.LNX.4.63.0612220320340.19693@wbgn013.biozentrum.uni-wuerzburg.de>

Would you believe? I edited git-merge-one-file (note the missing ".sh"!) when I submitted the patch which became commit e2b7008752...

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 git-merge-one-file.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index c49e4c6..7d62d79 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -104,7 +104,7 @@ case "${1:-.}${2:-.}${3:-.}" in
 	# Be careful for funny filename such as "-L" in "$4", which
 	# would confuse "merge" greatly.
 	src1=`git-unpack-file $2`
-	merge "$src1" "$orig" "$src2"
+	git-merge-file "$src1" "$orig" "$src2"
 	ret=$?
 
 	# Create the working tree file, using "our tree" version from the

-- 
1.4.4.2.gd74c-dirty