X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge-one-file.sh;h=7d62d7902cb1d7cd2749091b86d532306bea89b3;hb=566842f62bdf1f16c2e94fb431445d2e6c0f3f0b;hp=c49e4c65af606496c7e65b5147e36fee105d9ae7;hpb=5a4ffc8035e7bac6864482415afa3b1e240de6dd;p=git.git

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