[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 24 Apr 2014 16:46:39 +0200

On Wed, Mar 05, 2014 at 03:04:29PM -0800, Ben Reser wrote:
> I'd rather we do the following:
> m: run the external merge tool if configured or the internal merge tool if not.
> If the external merge tool fails, print an error and let the user decide what
> to do.
> l: run the external merge tool (maybe make this option prompt if you want to
> use the configured one or provide one, but that's probbaly getting out of scope)
> i: run the internal merge tool

I've implemented this today (see r1589707 and follow-ups).
Does it look good to you now?

Received on 2014-04-24 16:47:19 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.