From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Fri, 22 Dec 2006 02:20:55 +0000 (+0100)
Subject: Use git-merge-file in git-merge-one-file, too
X-Git-Tag: v1.5.0-rc0~48
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=caba139d432c420f853c352987cf29cefafc2b84;p=git.git

Use git-merge-file in git-merge-one-file, too

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>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index c49e4c65a..7d62d7902 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