* subversion/svn/conflict-callbacks.c
  (handle_text_conflict): Replace the other caller of launch_resolver()
   with a direct call to svn_cl__merge_file_externally().
   No functional change.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1589720 13f79535-47bb-0310-9956-ffa450edef68