Re: Merge dry-run and conflict resolution

2018-10-30 Thread Stefan Sperling
On Tue, Oct 30, 2018 at 10:27:28AM +0100, Branko Čibej wrote: > [Moving to dev@ as this is more of a development question.] > > On 30.10.2018 09:35, Jonathan Guy wrote: > > Hi all > > Just looking over the code for the interactive conflict resolution. > > This is just an initial observation but in

Re: Merge dry-run and conflict resolution

2018-10-30 Thread Branko Čibej
[Moving to dev@ as this is more of a development question.] On 30.10.2018 09:35, Jonathan Guy wrote: > Hi all > Just looking over the code for the interactive conflict resolution. > This is just an initial observation but in merge_cmd.c the function > svn_cl__merge calls run_merge then checks for