Make the 'quit' command at the conflict prompt actually quit right away.
Make the 'quit' command at the conflict prompt actually quit right away.

This command worked by side-effect of postponing all remaining conflicts
but didn't actually stop the conflict walk.
The QUIT flag passed around in the code was never actually read, just written.

* subversion/svn/resolve-cmd.c
  (conflict_status_walker): Check the conflict resolver QUIT flag and cancel
   the status walk if it is set.
  (walk_conflicts): Check for SVN_ERR_CANCELLED in combination with QUIT and
   don't treat this as an error. Don't write messages about being unable
   to resolve conflicts if the user canceled by hitting Ctrl-C, just exit.


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

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