Submitter | phabricator |
---|---|
Date | Nov. 16, 2019, 7:22 p.m. |
Message ID | <14bbc1307ee6d8426a5489eff3f20789@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/43305/ |
State | Not Applicable |
Headers | show |
Comments
Patch
diff --git a/mercurial/rcutil.py b/mercurial/rcutil.py --- a/mercurial/rcutil.py +++ b/mercurial/rcutil.py @@ -60,9 +60,9 @@ def defaultrcpath(): - '''return rc paths in default.d''' + '''return rc paths in defaultrc''' path = [] - defaultpath = os.path.join(util.datapath, b'default.d') + defaultpath = os.path.join(util.datapath, b'defaultrc') if os.path.isdir(defaultpath): path = _expandrcpath(defaultpath) return path diff --git a/mercurial/default.d/mergetools.rc b/mercurial/defaultrc/mergetools.rc rename from mercurial/default.d/mergetools.rc rename to mercurial/defaultrc/mergetools.rc