Mercurial > hg
diff hgext/rebase.py @ 38680:70448ec995c2
rebase: remove unnecessary confirm block
Removed unnecessary 'if confirm:' block as that thing is now
handled at 'finally'.
Differential Revision: https://phab.mercurial-scm.org/D3945
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Sat, 14 Jul 2018 23:00:22 +0530 |
parents | b3d0c97a0820 |
children | 8eeed92475d5 |
line wrap: on
line diff
--- a/hgext/rebase.py Sat Jul 14 08:59:42 2018 +0530 +++ b/hgext/rebase.py Sat Jul 14 23:00:22 2018 +0530 @@ -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: