{"push_id":955857523,"size":1,"distinct_size":1,"ref":"refs/heads/trunk","head":"b198c5db9cbca0fd755536b14afe98fb4fba04e9","before":"a43f83b45ebb84015c221323fe70bad06d350b27","commits":[{"sha":"b198c5db9cbca0fd755536b14afe98fb4fba04e9","author":{"email":"5bdb78a8cad883df1b360eae695997a65cec3099@apache.org","name":"Stefan Sperling"},"message":"Make the 'quit' command at the conflict prompt actually quit right away.\n\nThis command worked by side-effect of postponing all remaining conflicts\nbut didn't actually stop the conflict walk.\nThe QUIT flag passed around in the code was never actually read, just written.\n\n* subversion/svn/resolve-cmd.c\n  (conflict_status_walker): Check the conflict resolver QUIT flag and cancel\n   the status walk if it is set.\n  (walk_conflicts): Check for SVN_ERR_CANCELLED in combination with QUIT and\n   don't treat this as an error. Don't write messages about being unable\n   to resolve conflicts if the user canceled by hitting Ctrl-C, just exit.\n\n\ngit-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1727615 13f79535-47bb-0310-9956-ffa450edef68","distinct":true,"url":"https://api.github.com/repos/apache/subversion/commits/b198c5db9cbca0fd755536b14afe98fb4fba04e9"}]}