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