Factor out some common code in conflict handling.
Factor out some common code in conflict handling.

* subversion/libsvn_wc/conflicts.c
  (merge_showing_conflicts): New function, factored out ...
  (eval_text_conflict_func_result,
   resolve_text_conflict_on_node): ... of these two functions.
    Also note that these two functions are redundantly similar.

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

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