Skip to content
Snippets Groups Projects
Commit 70448ec9 authored by Sushil Khanchi's avatar Sushil Khanchi :koala:
Browse files

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
parent b3d0c97a
Branches
Tags
No related merge requests found
......@@ -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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment