changeset 45942 | 89a2afe31e82 |
parent 45768 | 5effb1992c17 |
child 46108 | bdc2bf68f19e |
45941:346af7687c6f | 45942:89a2afe31e82 |
---|---|
1230 False, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels |
1230 False, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels |
1231 ) |
1231 ) |
1232 |
1232 |
1233 |
1233 |
1234 def loadinternalmerge(ui, extname, registrarobj): |
1234 def loadinternalmerge(ui, extname, registrarobj): |
1235 """Load internal merge tool from specified registrarobj |
1235 """Load internal merge tool from specified registrarobj""" |
1236 """ |
|
1237 for name, func in pycompat.iteritems(registrarobj._table): |
1236 for name, func in pycompat.iteritems(registrarobj._table): |
1238 fullname = b':' + name |
1237 fullname = b':' + name |
1239 internals[fullname] = func |
1238 internals[fullname] = func |
1240 internals[b'internal:' + name] = func |
1239 internals[b'internal:' + name] = func |
1241 internalsdoc[fullname] = func |
1240 internalsdoc[fullname] = func |