equal
deleted
inserted
replaced
1 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> |
1 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> |
2 <html> |
2 <html> |
3 <head> |
3 <head> |
4 <title>Mercurial for Windows</title> |
4 <title>Mercurial for Windows</title> |
5 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" > |
5 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" > |
6 <style type="text/css"> |
6 <style type="text/css"> |
7 <!-- |
7 <!-- |
8 .indented |
8 .indented |
9 { |
9 { |
10 padding-left: 10pt; |
10 padding-left: 10pt; |
19 <p>Welcome to Mercurial for Windows!</p> |
19 <p>Welcome to Mercurial for Windows!</p> |
20 |
20 |
21 <p>Mercurial is a command-line application. You must run it from |
21 <p>Mercurial is a command-line application. You must run it from |
22 the Windows command prompt (or if you're hard core, a <a |
22 the Windows command prompt (or if you're hard core, a <a |
23 href="http://www.mingw.org/">MinGW</a> shell).</p> |
23 href="http://www.mingw.org/">MinGW</a> shell).</p> |
24 |
24 |
25 <p><div class="indented"><i>Note: the standard <a |
25 <p><div class="indented"><i>Note: the standard <a |
26 href="http://www.mingw.org/">MinGW</a> msys startup script uses |
26 href="http://www.mingw.org/">MinGW</a> msys startup script uses |
27 rxvt which has problems setting up standard input and output. |
27 rxvt which has problems setting up standard input and output. |
28 Running bash directly works correctly.</i></div> |
28 Running bash directly works correctly.</i></div> |
29 |
29 |
57 [ui] |
57 [ui] |
58 editor = whatever |
58 editor = whatever |
59 </pre> |
59 </pre> |
60 |
60 |
61 <h4>Configuring a Merge program</h4> |
61 <h4>Configuring a Merge program</h4> |
62 It should be emphasized that Mercurial by itself doesn't attempt to do a |
62 It should be emphasized that Mercurial by itself doesn't attempt to do a |
63 Merge at the file level, neither does it make any attempt to Resolve the conflicts. |
63 Merge at the file level, neither does it make any attempt to Resolve the conflicts. |
64 |
64 |
65 By default, Mercurial will use the merge program defined by the HGMERGE environment |
65 By default, Mercurial will use the merge program defined by the HGMERGE environment |
66 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) |
66 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) |
67 |
67 |
68 <h1>Reporting problems</h1> |
68 <h1>Reporting problems</h1> |
69 |
69 |
70 <p>Before you report any problems, please consult the <a |
70 <p>Before you report any problems, please consult the <a |