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

Re: svn commit: r1351792 - in /subversion/trunk/subversion: libsvn_client/merge.c tests/cmdline/merge_tests.py

From: Greg Stein <gstein_at_gmail.com>
Date: Mon, 25 Jun 2012 20:00:03 -0400

On Tue, Jun 19, 2012 at 2:26 PM, <stsp_at_apache.org> wrote:
> Author: stsp
> Date: Tue Jun 19 18:26:30 2012
> New Revision: 1351792
>
> URL: http://svn.apache.org/viewvc?rev=1351792&view=rev
> Log:
> Teach 'svn merge' to invoke the interactive conflict resolution callback
> after the merge, not during the merge.

Don't forget these changes, too...

Thanks
-g
Received on 2012-06-26 02:00:35 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.