Re: Unknown option for merge-recursive: -Xdiff-algorithm=minimal

2013-09-24 Thread John Keeping
On Tue, Sep 24, 2013 at 10:00:30AM +0100, Luke Noel-Storr wrote: > I'm trying to use the diff-algorithm option for recursive merge, but > get the above error. I've tried various different ways of specifying > the option, but none work. > > To try and find what the correct syntax is I tried peepin

Unknown option for merge-recursive: -Xdiff-algorithm=minimal

2013-09-24 Thread Luke Noel-Storr
Hi, I'm trying to use the diff-algorithm option for recursive merge, but get the above error. I've tried various different ways of specifying the option, but none work. To try and find what the correct syntax is I tried peeping into the source code, and it looks like it may actually be an err