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

mergetool: print an appropriate warning if merge.tool is unknown

Browse Source 
Also add support for vimdiff

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o
2007-03-18 22:30:10 -04:00
parent 9cec65399d
commit d6678c28e3
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
git-mergetool.sh
View File

@ -288,10 +288,15 @@ done
if test -z "$merge_tool"; then if test -z "$merge_tool"; then
merge_tool=`git-config merge.tool` merge_tool=`git-config merge.tool`
if test $merge_tool = kdiff3 -o $merge_tool = tkdiff -o \ case "$merge_tool" in
$merge_tool = xxdiff -o $merge_tool = meld ; then kdiff3 | tkdiff | xxdiff | meld | emerge | vimdiff)
;; # happy
*)
echo >&2 "git config option merge.tool set to unknown tool: $merge_tool"
echo >&2 "Resetting to default..."
unset merge_tool unset merge_tool
fi ;;
esac
fi fi
if test -z "$merge_tool" ; then if test -z "$merge_tool" ; then