Jeff King 33d3c6bb9b Merge branch 'da/mergetools-p4' ...

* da/mergetools-p4:
  mergetools/p4merge: Handle "/dev/null"

2012-10-25 06:42:57 -04: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

defaults

mergetool--lib: Allow custom commands to override built-ins

2012-09-25 09:04:39 -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

…

emerge

…

kdiff3

mergetool--lib: Refactor tools into separate files

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

kompare

…

meld

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

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

opendiff

…

p4merge

mergetools/p4merge: Handle "/dev/null"

2012-10-11 11:50:00 -07:00

tkdiff

mergetool--lib: Refactor tools into separate files

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

tortoisemerge

…

vim

mergetool--lib: Refactor tools into separate files

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

xxdiff

mergetool--lib: Refactor tools into separate files

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