Re: Using Meld for Merge Conflicts

2017-05-02 Thread Stefan Sperling
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)? > > T

Using Meld for Merge Conflicts

2017-05-02 Thread Jamie Jackson
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