Show More
@@ -788,7 +788,9 b' def rebase(ui, repo, **opts):' | |||||
788 | try: |
|
788 | try: | |
789 | # in-memory merge doesn't support conflicts, so if we hit any, abort |
|
789 | # in-memory merge doesn't support conflicts, so if we hit any, abort | |
790 | # and re-run as an on-disk merge. |
|
790 | # and re-run as an on-disk merge. | |
791 | return _origrebase(ui, repo, inmemory=inmemory, **opts) |
|
791 | overrides = {('rebase', 'singletransaction'): True} | |
|
792 | with ui.configoverride(overrides, 'rebase'): | |||
|
793 | return _origrebase(ui, repo, inmemory=inmemory, **opts) | |||
792 | except error.InMemoryMergeConflictsError: |
|
794 | except error.InMemoryMergeConflictsError: | |
793 | ui.warn(_('hit merge conflicts; re-running rebase without in-memory' |
|
795 | ui.warn(_('hit merge conflicts; re-running rebase without in-memory' | |
794 | ' merge\n')) |
|
796 | ' merge\n')) |
General Comments 0
You need to be logged in to leave comments.
Login now