diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-23 01:41:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-23 01:41:51 -0700 |
| commit | bbc0995792880d9f87f5c1a871f5f55b7284c7f1 (patch) | |
| tree | 70b605f42e50d75e7a79f0407287722c1b30ceb2 | |
| parent | d34f715853526bf55f1fa422d56608c32433c8d1 (diff) | |
| parent | 4481ff048df4c86021d783de6f099909495f04ff (diff) | |
| download | git-bbc0995792880d9f87f5c1a871f5f55b7284c7f1.tar.gz git-bbc0995792880d9f87f5c1a871f5f55b7284c7f1.tar.xz | |
Merge branch 'da/mergetool-lib'
* da/mergetool-lib:
mergetool--lib: specialize diff options for emerge and ecmerge
| -rw-r--r-- | git-mergetool--lib.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index a16a2795d..8b5e6a8c6 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) |