Re: [PATCH v3] mergetools/diffmerge: support DiffMerge as a git mergetool

2013-10-13 Thread Jonathan Nieder
Stefan Saasen wrote: Signed-off-by: Stefan Saasen ssaa...@atlassian.com Acked-by: David Aguilar dav...@gmail.com Thanks. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at

[PATCH v3] mergetools/diffmerge: support DiffMerge as a git mergetool

2013-10-12 Thread Stefan Saasen
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