# HG changeset patch # User Martin Geisler # Date 1242455196 -7200 # Node ID dbfe321643ce1bd3410adbd9f1630fe5ad926da2 # Parent 62b9cf446cbfb30ab449ace9432fa5a7502dca73 contrib/win32: add missing

tags diff -r 62b9cf446cbf -r dbfe321643ce contrib/win32/ReadMe.html --- 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 @@

Configuration notes

Default editor

- The default editor for commit messages is 'notepad'. You can set the EDITOR +

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:

 [ui]
 editor = whatever
 

Configuring a Merge program

- 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. +

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 MergeProgram on the Mercurial Wiki for more information) +

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 MergeProgram on the Mercurial Wiki for more information)

Reporting problems