..
araxis
mergetool--lib: Refactor tools into separate files
2011-08-19 00:09:19 -07:00
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
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
diffmerge
mergetools: stop setting $status in merge_cmd()
2014-11-21 11:27:53 -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
mergetools: stop setting $status in merge_cmd()
2014-11-21 11:27:53 -08: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
gvimdiff3
mergetools: add vimdiff3 mode
2014-04-22 12:49:07 -07:00
kdiff3
mergetools: stop setting $status in merge_cmd()
2014-11-21 11:27:53 -08:00
kompare
mergetool--lib: Refactor tools into separate files
2011-08-19 00:09:19 -07:00
meld
mergetools/meld: make usage of --output
configurable and more robust
2014-10-16 11:58:11 -07:00
opendiff
mergetool--lib: Refactor tools into separate files
2011-08-19 00:09:19 -07:00
p4merge
mergetools/p4merge: create a base if none available
2013-03-13 10:46:07 -07:00
tkdiff
mergetool--lib: Refactor tools into separate files
2011-08-19 00:09:19 -07:00
tortoisemerge
mergetools: teach tortoisemerge to handle filenames with SP correctly
2013-02-01 18:06:03 -08:00
vimdiff
mergetools: add vimdiff3 mode
2014-04-22 12:49:07 -07:00
vimdiff2
mergetools: simplify how we handle "vim" and "defaults"
2013-01-28 19:00:38 -08:00
vimdiff3
mergetools: add vimdiff3 mode
2014-04-22 12:49:07 -07:00
xxdiff
mergetool--lib: Refactor tools into separate files
2011-08-19 00:09:19 -07:00