# HG changeset patch
# User Lee Cantey
# Date 1177657098 25200
# Node ID 1386a9cffc88ed8672f7d5f4348537bf18d29575
# Parent 1bcf38111877fc988f8e12cfbb0cd53485d21b44
Add notes about configuring a merge program
diff -r 1bcf38111877 -r 1386a9cffc88 contrib/win32/ReadMe.html
--- 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.
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