[PATCH] Suppress conflict resolver in dry-run merge

[Jonathan Guy]

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

merge-cmd.c.patch
Description: Binary data