Mercurial > hg
diff mercurial/help/config.txt @ 11016:6a539853d4c0
help config: update windows documentation to match implementation
This shows how confusing the current implementation is on Windows.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Mon, 26 Apr 2010 16:36:08 +0200 |
parents | 2d4225faa61a |
children | 534c69494918 |
line wrap: on
line diff
--- a/mercurial/help/config.txt Tue Apr 27 09:47:33 2010 +0200 +++ b/mercurial/help/config.txt Mon Apr 26 16:36:08 2010 +0200 @@ -5,12 +5,13 @@ - ``<repo>\.hg\hgrc`` - ``%USERPROFILE%\.hgrc`` -- ``%USERPROFILE%\Mercurial.ini`` +- ``%USERPROFILE%\mercurial.ini`` - ``%HOME%\.hgrc`` -- ``%HOME%\Mercurial.ini`` -- ``C:\Mercurial\Mercurial.ini`` -- ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` -- ``<install-dir>\Mercurial.ini`` +- ``%HOME%\mercurial.ini`` +- ``C:\mercurial\mercurial.ini`` (unless regkey or hgrc.d\ or mercurial.ini found) +- ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (unless hgrc.d\ or mercurial.ini found) +- ``<hg.exe-dir>\hgrc.d\*.rc`` (unless mercurial.ini found) +- ``<hg.exe-dir>\mercurial.ini`` On Unix, these files are read: