changeset 22706 | ad25986c4cd3 |
parent 22032 | d7f25834ffbb |
child 22707 | 38e0363dcbe0 |
--- a/mercurial/filemerge.py Thu Oct 02 23:26:02 2014 +0900 +++ b/mercurial/filemerge.py Sun Sep 28 17:15:25 2014 +0200 @@ -28,6 +28,7 @@ fullname = 'internal:' + name func.__doc__ = "``%s``\n" % fullname + func.__doc__.strip() internals[fullname] = func + internals[':' + name] = func func.trymerge = trymerge func.onfailure = onfailure return func