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: NStefan Saasen <ssaasen@atlassian.com> Acked-by: NDavid Aguilar <davvid@gmail.com> Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>
Showing
mergetools/diffmerge
0 → 100644
想要评论请 注册 或 登录