56 from mercurial import context |
56 from mercurial import context |
57 from mercurial import discovery |
57 from mercurial import discovery |
58 from mercurial import error |
58 from mercurial import error |
59 from mercurial import extensions |
59 from mercurial import extensions |
60 from mercurial import localrepo |
60 from mercurial import localrepo |
|
61 from mercurial import merge |
61 from mercurial import phases |
62 from mercurial import phases |
62 from mercurial import revset |
63 from mercurial import revset |
63 from mercurial import scmutil |
64 from mercurial import scmutil |
64 from mercurial import templatekw |
65 from mercurial import templatekw |
65 from mercurial import merge |
|
66 from mercurial.node import bin, short, nullid |
66 from mercurial.node import bin, short, nullid |
67 |
67 |
68 # This extension contains the following code |
68 # This extension contains the following code |
69 # |
69 # |
70 # - Extension Helper code |
70 # - Extension Helper code |