Define a built-in attribute macro "binary".

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index c49e4c65af606496c7e65b5147e36fee105d9ae7..7d62d7902cb1d7cd2749091b86d532306bea89b3 100755 (executable)
--- 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