external merge tool with 'm' at conflict prompt (was: Re: svn commit: r1524145 - /subversion/trunk/subversion/svn/conflict-callbacks.c)

Digging up an old thread: On Tue, Nov 12, 2013 at 08:20:37PM -0800, Ben Reser wrote: > On 9/17/13 10:58 AM, s...@apache.org wrote: > > Author: stsp > > Date: Tue Sep 17 17:58:58 2013 > > New Revision: 1524145 > > > > URL: http://svn.apache.org/r1524145 > > Log: > > In the interactive confictt pro

RE: 1.9.0-alpha2 up for testing/signing

> -Original Message- > From: Ben Reser [mailto:b...@reser.org] > Sent: dinsdag 4 maart 2014 10:23 > To: Subversion Development > Subject: 1.9.0-alpha2 up for testing/signing > > The 1.9.0-alpha2 release artifacts are now available for testing/signing. > Please get the tarballs from > h

Re: external merge tool with 'm' at conflict prompt

On 3/5/14, 4:11 AM, Stefan Sperling wrote: > Digging up an old thread: Thanks for revisiting this. > I'm not just not trying to catch one particular problem case. > > I think it doesn't matter what error the external merge tool is raising. > Fact is, it most likely didn't produce a useful result