Code

Use git-merge-file in git-merge-one-file, too
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Fri, 22 Dec 2006 02:20:55 +0000 (03:20 +0100)
committerJunio C Hamano <junkio@cox.net>
Fri, 22 Dec 2006 04:33:06 +0000 (20:33 -0800)
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>
git-merge-one-file.sh

index c49e4c65af606496c7e65b5147e36fee105d9ae7..7d62d7902cb1d7cd2749091b86d532306bea89b3 100755 (executable)
@@ -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