You are viewing a plain text version of this content. The canonical link for it is here.

Posted to users@subversion.apache.org by Jamie Jackson <ja...@gmail.com> on 2017/05/02 17:51:13 UTC

Using Meld for Merge Conflicts

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

Re: Using Meld for Merge Conflicts

Posted by Stefan Sperling <st...@elego.de>.

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