changeset 48913 | f254fc73d956 |
parent 48875 | 6000f5b25c9b |
child 48946 | 642e31cb55f0 |
--- a/mercurial/filemerge.py Thu Mar 03 17:39:20 2022 -0800 +++ b/mercurial/filemerge.py Thu Mar 03 18:28:30 2022 -0800 @@ -1199,7 +1199,7 @@ def loadinternalmerge(ui, extname, registrarobj): """Load internal merge tool from specified registrarobj""" - for name, func in pycompat.iteritems(registrarobj._table): + for name, func in registrarobj._table.items(): fullname = b':' + name internals[fullname] = func internals[b'internal:' + name] = func