Mercurial > hg
changeset 8437:dbfe321643ce
contrib/win32: add missing <p> tags
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sat, 16 May 2009 08:26:36 +0200 |
parents | 62b9cf446cbf |
children | c1ad221a0e97 |
files | contrib/win32/ReadMe.html |
diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/win32/ReadMe.html Sat May 16 08:22:30 2009 +0200 +++ b/contrib/win32/ReadMe.html Sat May 16 08:26:36 2009 +0200 @@ -50,20 +50,20 @@ <h1>Configuration notes</h1> <h4>Default editor</h4> - The default editor for commit messages is 'notepad'. You can set the EDITOR + <p>The default editor for commit messages is 'notepad'. You can set the EDITOR (or HGEDITOR) environment variable to specify your preference or set it in - mercurial.ini: + mercurial.ini:</p> <pre> [ui] editor = whatever </pre> <h4>Configuring a Merge program</h4> - It should be emphasized that Mercurial by itself doesn't attempt to do a - Merge at the file level, neither does it make any attempt to Resolve the conflicts. + <p>It should be emphasized that Mercurial by itself doesn't attempt to do a + Merge at the file level, neither does it make any attempt to Resolve the conflicts.</p> - By default, Mercurial will use the merge program defined by the HGMERGE environment - variable, or uses the one defined in the mercurial.ini file. (see <a href="http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram">MergeProgram</a> on the Mercurial Wiki for more information) + <p>By default, Mercurial will use the merge program defined by the HGMERGE environment + variable, or uses the one defined in the mercurial.ini file. (see <a href="http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram">MergeProgram</a> on the Mercurial Wiki for more information)</p> <h1>Reporting problems</h1>