If a merge target has WC mergeinfo don't merge it with mergeinfo from the repos.
If a merge target has WC mergeinfo don't merge it with mergeinfo from the repos.

Suggested By: lundblad

* subversion/libsvn_client/merge.c
  (get_wc_and_repos_merge_info): Renamed to get_wc_or_repos_merge_info().
  (get_wc_or_repos_merge_info): New (rename).  Tweak docstring.  Return WC
  merge info *or* repos merge info.
  (do_merge, do_single_file_merge): Update callers to use new function name.


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

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