mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/work-around-grep-opt-insanity'

Browse Source 
* rs/work-around-grep-opt-insanity:
  Protect scripted Porcelains from GREP_OPTIONS insanity
  mergetool--lib: simplify guess_merge_tool()

Conflicts:
	git-instaweb.sh
This commit is contained in:
Junio C Hamano
2009-11-25 11:45:07 -08:00
parent b073b7a990 e1622bfcba
commit ad7ace714d
9 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
git-mergetool--lib.sh
View File

@ -338,15 +338,14 @@ guess_merge_tool () {
fi
tools="$tools gvimdiff diffuse ecmerge p4merge 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.