hgext/rebase.py
changeset 37332 b48b7b130d08
parent 37128 6f570c501e3e
child 37376 25940470c7e6
--- a/hgext/rebase.py	Tue Apr 03 13:16:12 2018 -0700
+++ b/hgext/rebase.py	Wed Apr 04 10:32:48 2018 -0700
@@ -788,7 +788,9 @@
         try:
             # in-memory merge doesn't support conflicts, so if we hit any, abort
             # and re-run as an on-disk merge.
-            return _origrebase(ui, repo, inmemory=inmemory, **opts)
+            overrides = {('rebase', 'singletransaction'): True}
+            with ui.configoverride(overrides, 'rebase'):
+                return _origrebase(ui, repo, inmemory=inmemory, **opts)
         except error.InMemoryMergeConflictsError:
             ui.warn(_('hit merge conflicts; re-running rebase without in-memory'
                       ' merge\n'))