diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-01-31 17:43:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-31 17:43:28 -0800 |
| commit | 2edefe38a813deb4dfbd62dcf47520aeb1af15fc (patch) | |
| tree | eb3b241d33eb2abda586b947825a7d1cf5f1ca6a | |
| parent | Merge branch 'maint' (diff) | |
| parent | mergetool: Don't repeat merge tool candidates (diff) | |
| download | tgif-2edefe38a813deb4dfbd62dcf47520aeb1af15fc.tar.xz | |
Merge branch 'jg/mergetool'
* jg/mergetool:
mergetool: Don't repeat merge tool candidates
| -rwxr-xr-x | git-mergetool.sh | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index 00e1337306..09f3a1068f 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -390,21 +390,19 @@ fi if test -z "$merge_tool" ; then if test -n "$DISPLAY"; then - merge_tool_candidates="kdiff3 tkdiff xxdiff meld gvimdiff" if test -n "$GNOME_DESKTOP_SESSION_ID" ; then - merge_tool_candidates="meld $merge_tool_candidates" - fi - if test "$KDE_FULL_SESSION" = "true"; then - merge_tool_candidates="kdiff3 $merge_tool_candidates" + merge_tool_candidates="meld kdiff3 tkdiff xxdiff gvimdiff" + else + merge_tool_candidates="kdiff3 tkdiff xxdiff meld gvimdiff" fi fi if echo "${VISUAL:-$EDITOR}" | grep 'emacs' > /dev/null 2>&1; then - merge_tool_candidates="$merge_tool_candidates emerge" - fi - if echo "${VISUAL:-$EDITOR}" | grep 'vim' > /dev/null 2>&1; then - merge_tool_candidates="$merge_tool_candidates vimdiff" + merge_tool_candidates="$merge_tool_candidates emerge opendiff vimdiff" + elif echo "${VISUAL:-$EDITOR}" | grep 'vim' > /dev/null 2>&1; then + merge_tool_candidates="$merge_tool_candidates vimdiff opendiff emerge" + else + merge_tool_candidates="$merge_tool_candidates opendiff emerge vimdiff" fi - merge_tool_candidates="$merge_tool_candidates opendiff emerge vimdiff" echo "merge tool candidates: $merge_tool_candidates" for i in $merge_tool_candidates; do init_merge_tool_path $i |