mirror of
https://github.com/git/git.git
synced 2024-10-30 13:57:54 +01:00
c5f424fd01
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> |
||
---|---|---|
.. | ||
araxis | ||
bc3 | ||
codecompare | ||
deltawalker | ||
diffmerge | ||
diffuse | ||
ecmerge | ||
emerge | ||
gvimdiff | ||
gvimdiff2 | ||
kdiff3 | ||
kompare | ||
meld | ||
opendiff | ||
p4merge | ||
tkdiff | ||
tortoisemerge | ||
vimdiff | ||
vimdiff2 | ||
xxdiff |