* subversion/svn/conflict-callbacks.c
  (handle_text_conflict): Remove redundant pre-condition checks for calls
   to svn_cl__merge_file(). These checks are either unnecessary or are
   already performed by the calling function. Tighten the scope of the
   remains_in_conflict flag which is only interesting if the internal
   merge tool is used. Move one call of svn_cl__merge_file() directly into
   the if-block which decides that svn_cl__merge_file() should be called.
   And don't complain if the user tries to merge a file more than once
   but allow users to re-do the merge.


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