summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-12-22 02:20:55 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-22 04:33:06 (GMT)
commitcaba139d432c420f853c352987cf29cefafc2b84 (patch)
tree1ab9894fc65dfd5b44679d0c8c2207d10b4abc50
parent7dda22e3174dd6e4b8b2f60fb0ad1e8f1be912ad (diff)
downloadgit-caba139d432c420f853c352987cf29cefafc2b84.zip
git-caba139d432c420f853c352987cf29cefafc2b84.tar.gz
git-caba139d432c420f853c352987cf29cefafc2b84.tar.bz2
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>
-rwxr-xr-xgit-merge-one-file.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index c49e4c6..7d62d79 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