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>
Johannes Schindelin committed
Dec 22, 2006 at 03:20 UTC
caba139d432c420f853c352987cf29cefafc2b84
1 file changed
+1
-1
git-merge-one-file.sh
+1
-1
@@ -104,7 +104,7 @@ case "${1:-.}${2:-.}${3:-.}" in
104
# Be careful for funny filename such as "-L" in "$4", which
105
# would confuse "merge" greatly.
106
src1=`git-unpack-file $2`
107
- merge "$src1" "$orig" "$src2"
107
+ git-merge-file "$src1" "$orig" "$src2"
108
ret=$?
109
110
# Create the working tree file, using "our tree" version from the