diff options
| author | Stefan Saasen <ssaasen@atlassian.com> | 2013-10-12 22:29:35 (GMT) |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2013-10-13 23:00:57 (GMT) |
| commit | c5f424fd014488bd8a92b97f52bfe47823bc2128 (patch) | |
| tree | 56bc7d54267bfe09027c8f6771d176bf02e346fb /contrib | |
| parent | 22bbddeafe5d5285def3dda76b300efd1363db1e (diff) | |
| download | git-c5f424fd014488bd8a92b97f52bfe47823bc2128.zip git-c5f424fd014488bd8a92b97f52bfe47823bc2128.tar.gz git-c5f424fd014488bd8a92b97f52bfe47823bc2128.tar.bz2 | |
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 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 86f7734..dba3c15 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1188,7 +1188,7 @@ _git_diff () __git_complete_revlist_file } -__git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff +__git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3 codecompare " |