equal
deleted
inserted
replaced
1197 return repo.wjoin(ctx.path()) |
1197 return repo.wjoin(ctx.path()) |
1198 |
1198 |
1199 |
1199 |
1200 def loadinternalmerge(ui, extname, registrarobj): |
1200 def loadinternalmerge(ui, extname, registrarobj): |
1201 """Load internal merge tool from specified registrarobj""" |
1201 """Load internal merge tool from specified registrarobj""" |
1202 for name, func in pycompat.iteritems(registrarobj._table): |
1202 for name, func in registrarobj._table.items(): |
1203 fullname = b':' + name |
1203 fullname = b':' + name |
1204 internals[fullname] = func |
1204 internals[fullname] = func |
1205 internals[b'internal:' + name] = func |
1205 internals[b'internal:' + name] = func |
1206 internalsdoc[fullname] = func |
1206 internalsdoc[fullname] = func |
1207 |
1207 |