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

2013-10-10 Thread David Aguilar
Stefan Saasen wrote: >Thanks for the review David, much appreciated. > >> I think this line was already too long in its current form. Would >you mind >> splitting up this long line? > >I've updated the patch and had a look at how to avoid repeating the >list of >available merge/difftools. > >> ..

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

2013-10-08 Thread Stefan Saasen
Thanks for the review David, much appreciated. > I think this line was already too long in its current form. Would you mind > splitting up this long line? I've updated the patch and had a look at how to avoid repeating the list of available merge/difftools. > ... follow it up with a change that

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

2013-10-06 Thread David Aguilar
On Sat, Oct 5, 2013 at 1:29 AM, Stefan Saasen wrote: > 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 too

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

2013-10-05 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 'diffmer