hgext/rebase.py

--- 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: