Junio C Hamano c1777a2970 Merge branch 'oc/mergetools-beyondcompare' ...

* oc/mergetools-beyondcompare:
  mergetool: rename bc3 to bc

2014-10-29 10:08:04 -07:00

..

araxis

…

bc

mergetool: rename bc3 to bc

2014-10-21 11:25:30 -07:00

bc3

mergetool: rename bc3 to bc

2014-10-21 11:25:30 -07:00

codecompare

…

deltawalker

…

diffmerge

mergetools/diffmerge: support DiffMerge as a git mergetool

2013-10-13 16:00:57 -07:00

diffuse

…

ecmerge

…

emerge

…

gvimdiff

…

gvimdiff2

…

gvimdiff3

mergetools: add vimdiff3 mode

2014-04-22 12:49:07 -07:00

kdiff3

mergetools/kdiff3: do not use --auto when diffing

2013-05-09 11:59:39 -07:00

kompare

…

meld

mergetools/meld: make usage of --output configurable and more robust

2014-10-16 11:58:11 -07:00

opendiff

…

p4merge

mergetools/p4merge: create a base if none available

2013-03-13 10:46:07 -07:00

tkdiff

…

tortoisemerge

…

vimdiff

mergetools: add vimdiff3 mode

2014-04-22 12:49:07 -07:00

vimdiff2

…

vimdiff3

mergetools: add vimdiff3 mode

2014-04-22 12:49:07 -07:00

xxdiff

…