Mercurial > evolve
changeset 6635:6940272bc07d
branching: merge with stable
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 03 Jan 2024 13:56:27 -0300 |
| parents | 991cbf0f66f2 (current diff) c8779efa4fb4 (diff) |
| children | 7f95546f584e |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/rewriteutil.py Tue Dec 26 16:02:05 2023 -0300 +++ b/hgext3rd/evolve/rewriteutil.py Wed Jan 03 13:56:27 2024 -0300 @@ -234,7 +234,7 @@ return repomarks, revs try: - from mercural import mergestate + from mercurial import mergestate mergestate.memmergestate hasmemmergestate = True except (ImportError, AttributeError):