Stefan Saasen c5f424fd01 mergetools/diffmerge: support DiffMerge as a git mergetool ... DiffMerge is a non-free (but gratis) tool that supports OS X, Windows and Linux. See http://www.sourcegear.com/diffmerge/ DiffMerge includes a script `/usr/bin/diffmerge` that can be used to launch the graphical compare tool. This change adds mergetool support for DiffMerge and adds 'diffmerge' as an option to the mergetool help. Signed-off-by: Stefan Saasen <ssaasen@atlassian.com> Acked-by: David Aguilar <davvid@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>		2013-10-13 16:00:57 -07:00
..
araxis
bc3
codecompare
deltawalker
diffmerge	mergetools/diffmerge: support DiffMerge as a git mergetool	2013-10-13 16:00:57 -07:00
diffuse
ecmerge
emerge
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	mergetools/kdiff3: do not use --auto when diffing	2013-05-09 11:59:39 -07:00
kompare
meld
opendiff
p4merge	mergetools/p4merge: create a base if none available	2013-03-13 10:46:07 -07:00
tkdiff
tortoisemerge	mergetools: teach tortoisemerge to handle filenames with SP correctly	2013-02-01 18:06:03 -08: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