* subversion/svn/conflict-callbacks.c   (handle_text_conflict): Restore ability to run the merge tool with a smiley    face at the conflict prompt. Fixes regression introduced in r1398147 :-)
* subversion/svn/conflict-callbacks.c
  (handle_text_conflict): Restore ability to run the merge tool with a smiley
   face at the conflict prompt. Fixes regression introduced in r1398147 :-)


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1398304 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion