D3945: rebase: remove unnecessary confirm block
khanchi97 (Sushil khanchi)
phabricator at mercurial-scm.org
Sun Jul 15 09:29:27 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG70448ec995c2: rebase: remove unnecessary confirm block (authored by khanchi97, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3945?vs=9595&id=9598
REVISION DETAIL
https://phab.mercurial-scm.org/D3945
AFFECTED FILES
hgext/rebase.py
CHANGE DETAILS
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -867,11 +867,6 @@
leaveunfinished=True)
except error.InMemoryMergeConflictsError:
ui.status(_('hit a merge conflict\n'))
- if confirm:
- # abort as in-memory merge doesn't support conflict
- rbsrt._prepareabortorcontinue(isabort=True, backup=False,
- suppwarns=True)
- needsabort = False
return 1
else:
if confirm:
To: khanchi97, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list