Introduce another helper function in the conflict resolver.
Introduce another helper function in the conflict resolver.

* subversion/libsvn_client/conflicts.c
  (select_default_move_target_abspath): New helper function which selects
   a default move target path from the set of candidates in the working copy.
  (configure_option_incoming_move_file_merge,
   configure_option_incoming_dir_merge): Use the new helper function instead
   of inlining its implementation.


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

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