| changeset 48875 | 6000f5b25c9b |
| parent 44856 | b7808443ed6a |
| 48874:af0b21d5a930 | 48875:6000f5b25c9b |
|---|---|
1 # Extension to write out fake unsupported records into the merge state |
1 # Extension to write out fake unsupported records into the merge state |
2 # |
2 # |
3 # |
3 # |
4 |
4 |
5 from __future__ import absolute_import |
|
6 |
5 |
7 from mercurial import ( |
6 from mercurial import ( |
8 mergestate as mergestatemod, |
7 mergestate as mergestatemod, |
9 registrar, |
8 registrar, |
10 ) |
9 ) |