* subversion/svn/conflict-callbacks.c
  (handle_text_conflict): Don't leave 'remains_in_conflict' uninitialised
   in some code paths.


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