* subversion/svn/cl-conflicts.c
  (handle_text_conflict): Replace one caller of launch_resolver()
   with a direct call to svn_cl__merge_file_externally(). Also take
   into account the 'remains_in_conflict' flag which is set if the
   external merge too exists with exit code 1. Previously this flag
   was ignored since launch_resolver() ignores it.


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