khanchi97 added a comment. @yuja Rebased, removed variable "needsabort/conflict" and moved that code to "except" and "else" clause accordingly. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3870 To: khanchi97, #hg-reviewers Cc: yuja, mercurial-devel