Mercurial > public > mercurial-scm > hg-stable

diff mercurial/filemerge.py @ 45957:89a2afe31e82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
formating: upgrade to black 20.8b1 This required a couple of small tweaks to un-confuse black, but now it works. Big formatting changes come from: * Dramatically improved collection-splitting logic upstream * Black having a strong (correct IMO) opinion that """ is better than ''' Differential Revision: https://phab.mercurial-scm.org/D9430
author Augie Fackler <raf@durin42.com>
date Fri, 27 Nov 2020 17:03:29 -0500
parents 5effb1992c17
children bdc2bf68f19e
line wrap: on
line diff
--- 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