* subversion/svn/conflict-callbacks.c
  (launch_resolver): Bye bye launch_resolver(), now unused.
   This was a very thin wrapper around svn_cl__merge_file_externally().


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