Mercurial > hg-stable
changeset 4386:1386a9cffc88
Add notes about configuring a merge program
| author | Lee Cantey <lcantey@gmail.com> |
|---|---|
| date | Thu, 26 Apr 2007 23:58:18 -0700 |
| parents | 1bcf38111877 |
| children | 93a4e72b4f83 |
| files | contrib/win32/ReadMe.html |
| diffstat | 1 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/win32/ReadMe.html Fri Apr 27 16:04:17 2007 -0700 +++ b/contrib/win32/ReadMe.html Thu Apr 26 23:58:18 2007 -0700 @@ -46,14 +46,21 @@ 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 + <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:</p> + 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>