##// END OF EJS Templates
contrib/win32: add missing <p> tags
Martin Geisler -
r8437:dbfe3216 default
parent child Browse files
Show More
@@ -50,20 +50,20 b' hg'
50
50
51 <h1>Configuration notes</h1>
51 <h1>Configuration notes</h1>
52 <h4>Default editor</h4>
52 <h4>Default editor</h4>
53 The default editor for commit messages is 'notepad'. You can set the EDITOR
53 <p>The default editor for commit messages is 'notepad'. You can set the EDITOR
54 (or HGEDITOR) environment variable to specify your preference or set it in
54 (or HGEDITOR) environment variable to specify your preference or set it in
55 mercurial.ini:
55 mercurial.ini:</p>
56 <pre>
56 <pre>
57 [ui]
57 [ui]
58 editor = whatever
58 editor = whatever
59 </pre>
59 </pre>
60
60
61 <h4>Configuring a Merge program</h4>
61 <h4>Configuring a Merge program</h4>
62 It should be emphasized that Mercurial by itself doesn't attempt to do a
62 <p>It should be emphasized that Mercurial by itself doesn't attempt to do a
63 Merge at the file level, neither does it make any attempt to Resolve the conflicts.
63 Merge at the file level, neither does it make any attempt to Resolve the conflicts.</p>
64
64
65 By default, Mercurial will use the merge program defined by the HGMERGE environment
65 <p>By default, Mercurial will use the merge program defined by the HGMERGE environment
66 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)
66 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>
67
67
68 <h1>Reporting problems</h1>
68 <h1>Reporting problems</h1>
69
69
General Comments 0
You need to be logged in to leave comments. Login now