In the conflict resolver, move duplicated code into a common helper function.
In the conflict resolver, move duplicated code into a common helper function.

* subversion/libsvn_client/conflicts.c
  (describe_incoming_move_merge_conflict_option): New helper function.
  (configure_option_incoming_move_file_merge,
   configure_option_incoming_dir_merge,
   svn_client_conflict_option_set_moved_to_abspath): Use new helper instead
    of inlining the same code.


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

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