diff options
| author |  Stefan Saasen <ssaasen@atlassian.com> | 2013-10-13 09:29:35 +1100 |
|---|---|---|
| committer |  Jonathan Nieder <jrnieder@gmail.com> | 2013-10-13 16:00:57 -0700 |
| commit | c5f424fd014488bd8a92b97f52bfe47823bc2128 (patch) | |
| tree | 56bc7d54267bfe09027c8f6771d176bf02e346fb /block-sha1 | |
| parent | .mailmap: switch to Thomas Rast's personal address (diff) | |
| download | tgif-c5f424fd014488bd8a92b97f52bfe47823bc2128.tar.xz | |
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>
Diffstat (limited to 'block-sha1')
0 files changed, 0 insertions, 0 deletions