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

On Mon, Jun 25, 2012 at 08:00:03PM -0400, Greg Stein wrote:
> 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

Yup, they're on my list.
Received on 2012-06-26 10:34:08 CEST