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
On 11/13/13 12:06 AM, Stefan Sperling wrote:
> Fair enough. Can you please add your rationale to the issue as well
> so the original reporter will see it?
>
> While at it, please reopen the issue and set the milestone to 1.9.x.
> I'll try to get it this done then and also address the issues you've
On Tue, Nov 12, 2013 at 08:20:37PM -0800, Ben Reser wrote:
> I'm not sure what we should be doing here but this much I can say this change
> shouldn't be backported. At least not yet. Though I'm really not sure how I
> feel about even backporting this to 1.8 since it pretty dramatically changes
>
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 prompt, make the 'merge' option try the external
> merge tool first, and fall back to the internal merge
4 matches
Mail list logo
