Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/__init__.py
author Pulkit Goyal <7895pulkit@gmail.com>
Sun, 02 Aug 2020 10:12:21 -0700
changeset 45278 0c849f0166c2
parent 43076 2372284d9457
child 48875 6000f5b25c9b
permissions -rw-r--r--
merge: introduce hasconflicts() on mergeresult object This and upcoming patches will improve the mergeresult object making it more powerful and provide clean APIs for various things. Doing this will clean up the core merge code which is present in `update()` a bit. Differential Revision: https://phab.mercurial-scm.org/D8816
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
28450
155e3308289c hgext: officially turn 'hgext' into a namespace package
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1360
diff changeset 
     1
 
from __future__ import absolute_import
155e3308289c hgext: officially turn 'hgext' into a namespace package
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1360
diff changeset 
     2
 
import pkgutil
43076
2372284d9457 formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents: 28450
diff changeset 
     3
 







28450






155e3308289c
hgext: officially turn 'hgext' into a namespace package



Pierre-Yves David <pierre-yves.david@fb.com>


parents: 
1360

diff
changeset




     4


__path__ = pkgutil.extend_path(__path__, __name__)















Mercurial