| changeset 50929 | 18c8c18993f0 |
| parent 50251 | 2fbc109fd58a |
| 50928:d718eddf01d9 | 50929:18c8c18993f0 |
|---|---|
6 # GNU General Public License version 2 or any later version. |
6 # GNU General Public License version 2 or any later version. |
7 |
7 |
8 import weakref |
8 import weakref |
9 |
9 |
10 from .i18n import _ |
10 from .i18n import _ |
11 from .pycompat import getattr |
|
12 from . import ( |
11 from . import ( |
13 error, |
12 error, |
14 match as matchmod, |
13 match as matchmod, |
15 merge, |
14 merge, |
16 mergestate as mergestatemod, |
15 mergestate as mergestatemod, |