rebase: in --confirm option just abort if hit a conflict

Authored by khanchi97.

Description

rebase: in --confirm option just abort if hit a conflict

Before this patch, it was prompting the user in both cases 1) when
there is no conflict 2) when there is at least one conflict. But
for simplicity we can just abort if we hit a conflict and no need to
prompt in that case.

Differential Revision: https://phab.mercurial-scm.org/D3944

Details

Committed
khanchi97Jul 13 2018, 11:29 PM
Differential Revision
D3944: rebase: in --confirm option just abort if hit a conflict
Parents
rHG7e4a856a4f05: pullbundle: fix handling of gzip bundlespecs
Branches
Unknown
Tags
Unknown