* subversion/libsvn_client/resolved.c   (binary_conflict_options, prop_conflict_options): Add the    svn_client_conflict_option_merged_text option here, too    The 'svn' client currently maps this option to 'mark resolved'.
* subversion/libsvn_client/resolved.c
  (binary_conflict_options, prop_conflict_options): Add the
   svn_client_conflict_option_merged_text option here, too
   The 'svn' client currently maps this option to 'mark resolved'.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1725989 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion