equal
deleted
inserted
replaced
1229 |
1229 |
1230 |
1230 |
1231 def loadinternalmerge(ui, extname, registrarobj): |
1231 def loadinternalmerge(ui, extname, registrarobj): |
1232 """Load internal merge tool from specified registrarobj |
1232 """Load internal merge tool from specified registrarobj |
1233 """ |
1233 """ |
1234 for name, func in registrarobj._table.iteritems(): |
1234 for name, func in pycompat.iteritems(registrarobj._table): |
1235 fullname = b':' + name |
1235 fullname = b':' + name |
1236 internals[fullname] = func |
1236 internals[fullname] = func |
1237 internals[b'internal:' + name] = func |
1237 internals[b'internal:' + name] = func |
1238 internalsdoc[fullname] = func |
1238 internalsdoc[fullname] = func |
1239 |
1239 |