# HG changeset patch
# User Lee Cantey
# Date 2007-04-27 06:58:18
# Node ID 1386a9cffc88ed8672f7d5f4348537bf18d29575
# Parent 1bcf38111877fc988f8e12cfbb0cd53485d21b44
Add notes about configuring a merge program
diff --git a/contrib/win32/ReadMe.html b/contrib/win32/ReadMe.html
--- a/contrib/win32/ReadMe.html
+++ b/contrib/win32/ReadMe.html
@@ -46,14 +46,21 @@ hg
other Mercurial commands should work fine for you.
Configuration notes
- The default editor for commit messages is 'notepad'. You can set the EDITOR
+
Default 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.
+
+ 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