104
106
# Be careful for funny filename such as "-L" in "$4", which
105
107
# would confuse "merge" greatly.
106
108
src1=`git-unpack-file $2`
110
112
# Create the working tree file, using "our tree" version from the
111
113
# index, and then store the result of the merge.
113
115
rm -f -- "$orig" "$src1" "$src2"
115
117
if [ "$6" != "$7" ]; then