* subversion/libsvn_client/merge.c   (make_conflict_versions): New helper, with code factored out from ...   (make_tree_conflict): ... this function, which now uses the helper.   (merge_file_changed): Use svn_wc_merge4(), using the new helper    function to construct the left and right conflict version info objects.
* subversion/libsvn_client/merge.c
  (make_conflict_versions): New helper, with code factored out from ...
  (make_tree_conflict): ... this function, which now uses the helper.
  (merge_file_changed): Use svn_wc_merge4(), using the new helper
   function to construct the left and right conflict version info objects.


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

wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion