Mercurial > hg
annotate contrib/win32/ReadMe.html @ 47914:8e46934c58d2
dirstate: drop the deprecated `merge` method
The method was deprecated in 5.9.
Differential Revision: https://phab.mercurial-scm.org/D11349
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 24 Aug 2021 21:11:57 +0200 |
parents | d4ba4d51f85f |
children | a1538c05d855 |
rev | line source |
---|---|
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
1 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
2 <html> |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
3 <head> |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
4 <title>Mercurial for Windows</title> |
5081
ea7b982b6c08
Remove trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4723
diff
changeset
|
5 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" > |
2091
fb8b35b0def9
update windows readme to document msys/mingw rxvt problems.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
6 <style type="text/css"> |
fb8b35b0def9
update windows readme to document msys/mingw rxvt problems.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
7 <!-- |
8441
ca7fa5e5b682
contrib/win32: add simple style sheet
Martin Geisler <mg@lazybytes.net>
parents:
8440
diff
changeset
|
8 html { |
ca7fa5e5b682
contrib/win32: add simple style sheet
Martin Geisler <mg@lazybytes.net>
parents:
8440
diff
changeset
|
9 font-family: sans-serif; |
ca7fa5e5b682
contrib/win32: add simple style sheet
Martin Geisler <mg@lazybytes.net>
parents:
8440
diff
changeset
|
10 margin: 1em 2em; |
ca7fa5e5b682
contrib/win32: add simple style sheet
Martin Geisler <mg@lazybytes.net>
parents:
8440
diff
changeset
|
11 } |
ca7fa5e5b682
contrib/win32: add simple style sheet
Martin Geisler <mg@lazybytes.net>
parents:
8440
diff
changeset
|
12 |
ca7fa5e5b682
contrib/win32: add simple style sheet
Martin Geisler <mg@lazybytes.net>
parents:
8440
diff
changeset
|
13 p { |
ca7fa5e5b682
contrib/win32: add simple style sheet
Martin Geisler <mg@lazybytes.net>
parents:
8440
diff
changeset
|
14 margin-top: 0.5em; |
ca7fa5e5b682
contrib/win32: add simple style sheet
Martin Geisler <mg@lazybytes.net>
parents:
8440
diff
changeset
|
15 margin-bottom: 0.5em; |
ca7fa5e5b682
contrib/win32: add simple style sheet
Martin Geisler <mg@lazybytes.net>
parents:
8440
diff
changeset
|
16 } |
ca7fa5e5b682
contrib/win32: add simple style sheet
Martin Geisler <mg@lazybytes.net>
parents:
8440
diff
changeset
|
17 |
ca7fa5e5b682
contrib/win32: add simple style sheet
Martin Geisler <mg@lazybytes.net>
parents:
8440
diff
changeset
|
18 pre { |
ca7fa5e5b682
contrib/win32: add simple style sheet
Martin Geisler <mg@lazybytes.net>
parents:
8440
diff
changeset
|
19 margin: 0.25em 0em; |
ca7fa5e5b682
contrib/win32: add simple style sheet
Martin Geisler <mg@lazybytes.net>
parents:
8440
diff
changeset
|
20 padding: 0.5em; |
ca7fa5e5b682
contrib/win32: add simple style sheet
Martin Geisler <mg@lazybytes.net>
parents:
8440
diff
changeset
|
21 background-color: #EEE; |
ca7fa5e5b682
contrib/win32: add simple style sheet
Martin Geisler <mg@lazybytes.net>
parents:
8440
diff
changeset
|
22 border: thin solid #CCC; |
ca7fa5e5b682
contrib/win32: add simple style sheet
Martin Geisler <mg@lazybytes.net>
parents:
8440
diff
changeset
|
23 } |
ca7fa5e5b682
contrib/win32: add simple style sheet
Martin Geisler <mg@lazybytes.net>
parents:
8440
diff
changeset
|
24 |
ca7fa5e5b682
contrib/win32: add simple style sheet
Martin Geisler <mg@lazybytes.net>
parents:
8440
diff
changeset
|
25 .indented { |
ca7fa5e5b682
contrib/win32: add simple style sheet
Martin Geisler <mg@lazybytes.net>
parents:
8440
diff
changeset
|
26 padding-left: 10pt; |
2091
fb8b35b0def9
update windows readme to document msys/mingw rxvt problems.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
27 } |
fb8b35b0def9
update windows readme to document msys/mingw rxvt problems.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
28 --> |
fb8b35b0def9
update windows readme to document msys/mingw rxvt problems.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
29 </style> |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
30 </head> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
31 |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
32 <body> |
3863
1ef8ada4370f
Remove hard-coded version numbers and release notes from packaging
Matt Mackall <mpm@selenic.com>
parents:
3432
diff
changeset
|
33 <h1>Mercurial for Windows</h1> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
34 |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
35 <p>Welcome to Mercurial for Windows!</p> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
36 |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
37 <p> |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
38 Mercurial is a command-line application. You must run it from |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
39 the Windows command prompt (or if you're hard core, a <a |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
40 href="http://www.mingw.org/">MinGW</a> shell). |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
41 </p> |
5081
ea7b982b6c08
Remove trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4723
diff
changeset
|
42 |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
43 <p class="indented"> |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
44 <i>Note: the standard <a href="http://www.mingw.org/">MinGW</a> |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
45 msys startup script uses rxvt which has problems setting up |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
46 standard input and output. Running bash directly works |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
47 correctly.</i> |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
48 </p> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
49 |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
50 <p> |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
51 For documentation, please visit the <a |
26421
4b0fc75f9403
urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents:
24191
diff
changeset
|
52 href="https://mercurial-scm.org/">Mercurial web site</a>. |
4723
fb4b6d5fe100
Update binary installer files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4635
diff
changeset
|
53 You can also download a free book, <a |
34921
76ba5b5a53f0
packaging: update book URL in Mac and Windows READMEs
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
30907
diff
changeset
|
54 href="https://book.mercurial-scm.org/">Mercurial: The Definitive |
8440
bfcbba5f4b99
contrib/win32: updated title of the hgbook
Martin Geisler <mg@lazybytes.net>
parents:
8439
diff
changeset
|
55 Guide</a>. |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
56 </p> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
57 |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
58 <p> |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
59 By default, Mercurial installs to <tt>C:\Program |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
60 Files\Mercurial</tt>. The Mercurial command is called |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
61 <tt>hg.exe</tt>. |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
62 </p> |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
63 |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
64 <h1>Testing Mercurial after you've installed it</h1> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
65 |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
66 <p> |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
67 The easiest way to check that Mercurial is installed properly is |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
68 to just type the following at the command prompt: |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
69 </p> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
70 |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
71 <pre> |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
72 hg |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
73 </pre> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
74 |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
75 <p> |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
76 This command should print a useful help message. If it does, |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
77 other Mercurial commands should work fine for you. |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
78 </p> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
79 |
2307
5b3a3e35f084
Add section for configuration notes with initial note about the default editor
Lee Cantey <lcantey@gmail.com>
parents:
2276
diff
changeset
|
80 <h1>Configuration notes</h1> |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
81 <h4>Default editor</h4> |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
82 <p> |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
83 The default editor for commit messages is 'notepad'. You can set |
8439
7327f24bfef3
contrib/win32: format file names and env vars with <tt>
Martin Geisler <mg@lazybytes.net>
parents:
8438
diff
changeset
|
84 the <tt>EDITOR</tt> (or <tt>HGEDITOR</tt>) environment variable |
7327f24bfef3
contrib/win32: format file names and env vars with <tt>
Martin Geisler <mg@lazybytes.net>
parents:
8438
diff
changeset
|
85 to specify your preference or set it in <tt>mercurial.ini</tt>: |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
86 </p> |
2321
d9ca698e3c5a
Update configuration note with mercurial.ini change from Thomas
Lee Cantey <lcantey@gmail.com>
parents:
2307
diff
changeset
|
87 <pre> |
d9ca698e3c5a
Update configuration note with mercurial.ini change from Thomas
Lee Cantey <lcantey@gmail.com>
parents:
2307
diff
changeset
|
88 [ui] |
d9ca698e3c5a
Update configuration note with mercurial.ini change from Thomas
Lee Cantey <lcantey@gmail.com>
parents:
2307
diff
changeset
|
89 editor = whatever |
d9ca698e3c5a
Update configuration note with mercurial.ini change from Thomas
Lee Cantey <lcantey@gmail.com>
parents:
2307
diff
changeset
|
90 </pre> |
d9ca698e3c5a
Update configuration note with mercurial.ini change from Thomas
Lee Cantey <lcantey@gmail.com>
parents:
2307
diff
changeset
|
91 |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
92 <h4>Configuring a Merge program</h4> |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
93 <p> |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
94 It should be emphasized that Mercurial by itself doesn't attempt |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
95 to do a Merge at the file level, neither does it make any |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
96 attempt to Resolve the conflicts. |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
97 </p> |
4386
1386a9cffc88
Add notes about configuring a merge program
Lee Cantey <lcantey@gmail.com>
parents:
3863
diff
changeset
|
98 |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
99 <p> |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
100 By default, Mercurial will use the merge program defined by the |
8439
7327f24bfef3
contrib/win32: format file names and env vars with <tt>
Martin Geisler <mg@lazybytes.net>
parents:
8438
diff
changeset
|
101 <tt>HGMERGE</tt> environment variable, or uses the one defined |
7327f24bfef3
contrib/win32: format file names and env vars with <tt>
Martin Geisler <mg@lazybytes.net>
parents:
8438
diff
changeset
|
102 in the <tt>mercurial.ini</tt> file. (see <a |
26421
4b0fc75f9403
urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents:
24191
diff
changeset
|
103 href="https://mercurial-scm.org/wiki/MergeProgram">MergeProgram</a> |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
104 on the Mercurial Wiki for more information) |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
105 </p> |
2307
5b3a3e35f084
Add section for configuration notes with initial note about the default editor
Lee Cantey <lcantey@gmail.com>
parents:
2276
diff
changeset
|
106 |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
107 <h1>Reporting problems</h1> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
108 |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
109 <p> |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
110 Before you report any problems, please consult the <a |
26421
4b0fc75f9403
urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents:
24191
diff
changeset
|
111 href="https://mercurial-scm.org/">Mercurial web site</a> |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
112 and see if your question is already in our list of <a |
26421
4b0fc75f9403
urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents:
24191
diff
changeset
|
113 href="https://mercurial-scm.org/wiki/FAQ">Frequently |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
114 Answered Questions</a> (the "FAQ"). |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
115 </p> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
116 |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
117 <p> |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
118 If you cannot find an answer to your question, please feel free |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
119 to send mail to the Mercurial mailing list, at <a |
29666
52227dbe2ff8
win32: update link to mailing list in readme
Anton Shestakov <av6@dwimlabs.net>
parents:
27925
diff
changeset
|
120 href="mailto:mercurial@mercurial-scm.org">mercurial@mercurial-scm.org</a>. |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
121 <b>Remember</b>, the more useful information you include in your |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
122 report, the easier it will be for us to help you! |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
123 </p> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
124 |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
125 <p> |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
126 If you are IRC-savvy, that's usually the fastest way to get |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
127 help. Go to <tt>#mercurial</tt> on <tt>irc.freenode.net</tt>. |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
128 </p> |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
129 |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
130 <h1>Author and copyright information</h1> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
131 |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
132 <p> |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
133 Mercurial was written by <a href="http://www.selenic.com">Matt |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
134 Mackall</a>, and is maintained by Matt and a team of volunteers. |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
135 </p> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
136 |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
137 <p> |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
138 The Windows installer was written by <a |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
139 href="http://www.serpentine.com/blog">Bryan O'Sullivan</a>. |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
140 </p> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
141 |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
142 <p> |
46819
d4ba4d51f85f
contributor: change mentions of mpm to olivia
Raphaël Gomès <rgomes@octobus.net>
parents:
46413
diff
changeset
|
143 Mercurial is Copyright 2005-2021 Olivia Mackall and others. |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
144 </p> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
145 |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
146 <p> |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
147 Mercurial is free software; you can redistribute it and/or |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
148 modify it under the terms of the <a |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
149 href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt">GNU |
10263 | 150 General Public License version 2</a> or any later version. |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
151 </p> |
1287
40ccb87dac71
Add win32 README for standalone installer.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
152 |
8438
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
153 <p> |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
154 Mercurial is distributed in the hope that it will be useful, but |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
155 <b>without any warranty</b>; without even the implied warranty |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
156 of <b>merchantability</b> or <b>fitness for a particular |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
157 purpose</b>. See the GNU General Public License for more |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
158 details. |
c1ad221a0e97
contrib/win32: indent and word wrap consistently
Martin Geisler <mg@lazybytes.net>
parents:
8437
diff
changeset
|
159 </p> |
1288
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
160 </body> |
9a625fbfa220
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1287
diff
changeset
|
161 </html> |