diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:53:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:53:58 -0800 |
| commit | 957f5db74fcf2a00260c8bdef4bf147b1b990914 (patch) | |
| tree | 293baa7d48d5c9428b2ffc232519f875d4cd5770 /git-mergetool--lib.sh | |
| parent | af742b9b27c3e3caac9b304c76db323e2334b955 (diff) | |
| parent | e1622bfcbad680225ad5c337e4778df88389227e (diff) | |
| download | git-957f5db74fcf2a00260c8bdef4bf147b1b990914.tar.xz | |
Merge branch 'rs/work-around-grep-opt-insanity' into maint
* rs/work-around-grep-opt-insanity:
Protect scripted Porcelains from GREP_OPTIONS insanity
mergetool--lib: simplify guess_merge_tool()
Diffstat (limited to 'git-mergetool--lib.sh')
| -rw-r--r-- | git-mergetool--lib.sh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index bfb01f7842..334af7c347 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -325,15 +325,14 @@ guess_merge_tool () { fi tools="$tools gvimdiff diffuse ecmerge araxis" fi - if echo "${VISUAL:-$EDITOR}" | grep emacs > /dev/null 2>&1; then - # $EDITOR is emacs so add emerge as a candidate - tools="$tools emerge vimdiff" - elif echo "${VISUAL:-$EDITOR}" | grep vim > /dev/null 2>&1; then - # $EDITOR is vim so add vimdiff as a candidate + case "${VISUAL:-$EDITOR}" in + *vim*) tools="$tools vimdiff emerge" - else + ;; + *) tools="$tools emerge vimdiff" - fi + ;; + esac echo >&2 "merge tool candidates: $tools" # Loop over each candidate and stop when a valid merge tool is found. |