| commit | c5f424fd014488bd8a92b97f52bfe47823bc2128 | |
| author | Stefan Saasen <ssaasen@atlassian.com> | |
| Sat, 12 Oct 2013 22:29:35 +0000 (13 09:29 +1100) | ||
| committer | Jonathan Nieder <jrnieder@gmail.com> | |
| Sun, 13 Oct 2013 23:00:57 +0000 (13 16:00 -0700) | ||
| tree | 56bc7d54267bfe09027c8f6771d176bf02e346fb | treesnapshot (tar.gz zip) |
| parent | 22bbddeafe5d5285def3dda76b300efd1363db1e | commitdiff |
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>
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>
| contrib/completion/git-completion.bash | diffblobblamehistory | |
| git-mergetool--lib.sh | diffblobblamehistory | |
| mergetools/diffmerge | [new file with mode: 0644] | blob |