Jonathan Guy <jonathan.guy at>


r1845557 | stsp | 2018-11-02 09:31:50 +0000 (Fri, 02 Nov 2018)

Skip interactive conflict resolution after a dry-run merge.

The resolver will find that it has nothing to do in dry-run mode because
no new conflicts were recorded. So running it is a pointless exercise.

* subversion/svn/merge-cmd.c
  (svn_cl__merge): Suppress the interactive conflict resolver 
   if a merge has been performed with the dry-run option.

Patch by: Jonathan Guy <jonathan.guy at>