undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jg/mergetool'

Browse Source 
* jg/mergetool:
  mergetool: Don't repeat merge tool candidates
This commit is contained in:
Junio C Hamano 2009-01-31 17:43:28 -08:00
commit 2edefe38a8
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
git-mergetool.sh
View File

@ -390,21 +390,19 @@ fi
if test -z "$merge_tool" ; then if test -z "$merge_tool" ; then
if test -n "$DISPLAY"; then if test -n "$DISPLAY"; then
merge_tool_candidates="kdiff3 tkdiff xxdiff meld gvimdiff"
if test -n "$GNOME_DESKTOP_SESSION_ID" ; then if test -n "$GNOME_DESKTOP_SESSION_ID" ; then
merge_tool_candidates="meld $merge_tool_candidates" merge_tool_candidates="meld kdiff3 tkdiff xxdiff gvimdiff"
fi else
if test "$KDE_FULL_SESSION" = "true"; then merge_tool_candidates="kdiff3 tkdiff xxdiff meld gvimdiff"
merge_tool_candidates="kdiff3 $merge_tool_candidates"
fi fi
fi fi
if echo "${VISUAL:-$EDITOR}" | grep 'emacs' > /dev/null 2>&1; then if echo "${VISUAL:-$EDITOR}" | grep 'emacs' > /dev/null 2>&1; then
merge_tool_candidates="$merge_tool_candidates emerge" merge_tool_candidates="$merge_tool_candidates emerge opendiff vimdiff"
fi elif echo "${VISUAL:-$EDITOR}" | grep 'vim' > /dev/null 2>&1; then
if echo "${VISUAL:-$EDITOR}" | grep 'vim' > /dev/null 2>&1; then merge_tool_candidates="$merge_tool_candidates vimdiff opendiff emerge"
merge_tool_candidates="$merge_tool_candidates vimdiff" else
fi
merge_tool_candidates="$merge_tool_candidates opendiff emerge vimdiff" merge_tool_candidates="$merge_tool_candidates opendiff emerge vimdiff"
fi
echo "merge tool candidates: $merge_tool_candidates" echo "merge tool candidates: $merge_tool_candidates"
for i in $merge_tool_candidates; do for i in $merge_tool_candidates; do
init_merge_tool_path $i init_merge_tool_path $i