subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Sperling <s...@elego.de>
Subject Re: Using Meld for Merge Conflicts
Date Tue, 02 May 2017 19:28:41 GMT
On Tue, May 02, 2017 at 01:51:13PM -0400, Jamie Jackson wrote:
> I'm on Mac, and I thought I'd use Meld for merge conflicts. However,
> this doesn't seem to work: http://stackoverflow.com/a/7418087.
> 
> What's the right way to do this with modern versions of SVN (1.9.5)
> and Meld (3.16.0)?
> 
> Thanks,
> Jamie

Use a wrapper script which passes arguments to your merge tool
in the order your merge tool wants to see them.
See http://svnbook.red-bean.com/nightly/en/svn.advanced.externaldifftools.html

Mime
View raw message