changeset 45942 | 89a2afe31e82 |
parent 45768 | 5effb1992c17 |
child 46108 | bdc2bf68f19e |
--- a/mercurial/filemerge.py Fri Nov 27 17:00:00 2020 -0500 +++ b/mercurial/filemerge.py Fri Nov 27 17:03:29 2020 -0500 @@ -1232,8 +1232,7 @@ def loadinternalmerge(ui, extname, registrarobj): - """Load internal merge tool from specified registrarobj - """ + """Load internal merge tool from specified registrarobj""" for name, func in pycompat.iteritems(registrarobj._table): fullname = b':' + name internals[fullname] = func