hgext/rebase.py

38442:36edfbac7281

            with ui.configoverride(overrides, 'rebase'):
                _origrebase(ui, repo, inmemory=True, leaveunfinished=True,
                            **opts)
        except error.InMemoryMergeConflictsError:
            ui.status(_('hit a merge conflict\n'))
        else:
            ui.status(_('there will be no conflict, you can rebase\n'))
        finally:
            _origrebase(ui, repo, abort=True)
    elif inmemory:
        try:
            # in-memory merge doesn't support conflicts, so if we hit any, abort

38443:e6b643ccf87d

            with ui.configoverride(overrides, 'rebase'):
                _origrebase(ui, repo, inmemory=True, leaveunfinished=True,
                            **opts)
        except error.InMemoryMergeConflictsError:
            ui.status(_('hit a merge conflict\n'))
            return 1
        else:
            ui.status(_('there will be no conflict, you can rebase\n'))
            return 0
        finally:
            _origrebase(ui, repo, abort=True)
    elif inmemory:
        try:
            # in-memory merge doesn't support conflicts, so if we hit any, abort