Show More
@@ -46,14 +46,21 b' hg' | |||
|
46 | 46 | other Mercurial commands should work fine for you.</p> |
|
47 | 47 | |
|
48 | 48 | <h1>Configuration notes</h1> |
|
49 | <p>The default editor for commit messages is 'notepad'. You can set the EDITOR | |
|
49 | <h4>Default editor</h4> | |
|
50 | The default editor for commit messages is 'notepad'. You can set the EDITOR | |
|
50 | 51 | (or HGEDITOR) environment variable to specify your preference or set it in |
|
51 |
mercurial.ini: |
|
|
52 | mercurial.ini: | |
|
52 | 53 | <pre> |
|
53 | 54 | [ui] |
|
54 | 55 | editor = whatever |
|
55 | 56 | </pre> |
|
56 | 57 | |
|
58 | <h4>Configuring a Merge program</h4> | |
|
59 | It should be emphasized that Mercurial by itself doesn't attempt to do a | |
|
60 | Merge at the file level, neither does it make any attempt to Resolve the conflicts. | |
|
61 | ||
|
62 | By default, Mercurial will use the merge program defined by the HGMERGE environment | |
|
63 | 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) | |
|
57 | 64 | |
|
58 | 65 | <h1>Reporting problems</h1> |
|
59 | 66 |
General Comments 0
You need to be logged in to leave comments.
Login now