Show More
1 | NO CONTENT: file renamed from mercurial/default.d/mergetools.rc to mercurial/defaultrc/mergetools.rc |
|
NO CONTENT: file renamed from mercurial/default.d/mergetools.rc to mercurial/defaultrc/mergetools.rc |
@@ -60,9 +60,9 b' def envrcitems(env=None):' | |||||
60 |
|
60 | |||
61 |
|
61 | |||
62 | def defaultrcpath(): |
|
62 | def defaultrcpath(): | |
63 |
'''return rc paths in default |
|
63 | '''return rc paths in defaultrc''' | |
64 | path = [] |
|
64 | path = [] | |
65 |
defaultpath = os.path.join(util.datapath, b'default |
|
65 | defaultpath = os.path.join(util.datapath, b'defaultrc') | |
66 | if os.path.isdir(defaultpath): |
|
66 | if os.path.isdir(defaultpath): | |
67 | path = _expandrcpath(defaultpath) |
|
67 | path = _expandrcpath(defaultpath) | |
68 | return path |
|
68 | return path |
General Comments 0
You need to be logged in to leave comments.
Login now