Junio C Hamano 55f56fee07 Merge branch 'jk/mergetool' ...

Cleans up mergetool/difftool combo.

* jk/mergetool:
  mergetools: simplify how we handle "vim" and "defaults"
  mergetool--lib: don't call "exit" in setup_tool
  mergetool--lib: improve show_tool_help() output
  mergetools/vim: remove redundant diff command
  git-difftool: use git-mergetool--lib for "--tool-help"
  git-mergetool: don't hardcode 'mergetool' in show_tool_help
  git-mergetool: remove redundant assignment
  git-mergetool: move show_tool_help to mergetool--lib

2013-02-07 14:41:57 -08:00

..

araxis

mergetool--lib: Refactor tools into separate files

2011-08-19 00:09:19 -07:00

bc3

mergetools: use the correct tool for Beyond Compare 3 on Windows

2011-10-15 20:13:55 -07:00

codecompare

Add Code Compare v2.80.4 as a merge / diff tool for Windows

2012-08-10 08:08:08 -07:00

deltawalker

mergetools: add a plug-in to support DeltaWalker

2012-03-05 09:31:47 -08:00

diffuse

mergetool--lib: Refactor tools into separate files

2011-08-19 00:09:19 -07:00

ecmerge

mergetool--lib: Refactor tools into separate files

2011-08-19 00:09:19 -07:00

emerge

mergetool--lib: Refactor tools into separate files

2011-08-19 00:09:19 -07:00

gvimdiff

mergetools: simplify how we handle "vim" and "defaults"

2013-01-28 19:00:38 -08:00

gvimdiff2

mergetools: simplify how we handle "vim" and "defaults"

2013-01-28 19:00:38 -08:00

kdiff3

mergetool--lib: Refactor tools into separate files

2011-08-19 00:09:19 -07:00

kompare

mergetool--lib: Refactor tools into separate files

2011-08-19 00:09:19 -07:00

meld

mergetools/meld: Use --help output to detect --output support

2012-02-10 14:53:18 -08:00

opendiff

mergetool--lib: Refactor tools into separate files

2011-08-19 00:09:19 -07:00

p4merge

mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder

2012-12-26 18:13:15 -08:00

tkdiff

mergetool--lib: Refactor tools into separate files

2011-08-19 00:09:19 -07:00

tortoisemerge

mergetool--lib: Refactor tools into separate files

2011-08-19 00:09:19 -07:00

vimdiff

mergetools: simplify how we handle "vim" and "defaults"

2013-01-28 19:00:38 -08:00

vimdiff2

mergetools: simplify how we handle "vim" and "defaults"

2013-01-28 19:00:38 -08:00

xxdiff

mergetool--lib: Refactor tools into separate files

2011-08-19 00:09:19 -07:00