On Tue, Jun 19, 2012 at 2:26 PM, <s...@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
