summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2009-05-02 08:57:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-05-09 15:25:22 (GMT)
commit4481ff048df4c86021d783de6f099909495f04ff (patch)
treef8eaa802fe3a1738f31eab7063b3b040d6662976 /git-mergetool--lib.sh
parentf01f1099f40f24fe6f7802185340a6fa3a3d4f35 (diff)
downloadgit-4481ff048df4c86021d783de6f099909495f04ff.zip
git-4481ff048df4c86021d783de6f099909495f04ff.tar.gz
git-4481ff048df4c86021d783de6f099909495f04ff.tar.bz2
mergetool--lib: specialize diff options for emerge and ecmerge
The ecmerge documentation mentions the following form: ecmerge --mode=diff2 $1 $2 Since git-difftool is about diffing, we should use that instead of --mode=merge2. Likewise, this drops the $MERGED argument to emerge, as discussed on the git list ($gmane/117930). Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
-rw-r--r--git-mergetool--lib.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index a16a279..8b5e6a8 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -228,8 +228,8 @@ run_merge_tool () {
fi
check_unchanged
else
- "$merge_tool_path" "$LOCAL" "$REMOTE" \
- --default --mode=merge2 --to="$MERGED"
+ "$merge_tool_path" --default --mode=diff2 \
+ "$LOCAL" "$REMOTE"
fi
;;
emerge)
@@ -248,7 +248,7 @@ run_merge_tool () {
status=$?
else
"$merge_tool_path" -f emerge-files-command \
- "$LOCAL" "$REMOTE" "$(basename "$MERGED")"
+ "$LOCAL" "$REMOTE"
fi
;;
tortoisemerge)