comparison contrib/win32/ReadMe.html @ 4386:1386a9cffc88

Add notes about configuring a merge program

4385:1bcf38111877

    <p>This command should print a useful help message.  If it does,
      other Mercurial commands should work fine for you.</p>

    <h1>Configuration notes</h1>
    <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:</p>
    <pre>
[ui]
editor = whatever
</pre>


    <h1>Reporting problems</h1>

    <p>Before you report any problems, please consult the <a
	href="http://www.selenic.com/mercurial">Mercurial web site</a> and

4386:1386a9cffc88

    <p>This command should print a useful help message.  If it does,
      other Mercurial commands should work fine for you.</p>

    <h1>Configuration notes</h1>
	<h4>Default editor</h4>
	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:
    <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.

    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)

    <h1>Reporting problems</h1>

    <p>Before you report any problems, please consult the <a
	href="http://www.selenic.com/mercurial">Mercurial web site</a> and