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 ikoder.com>
|
subversion/trunk/subversion/svn/merge-cmd.c