Mercurial > hg > mercurial-crew-with-dirclash
annotate README @ 5390:36c46e20976a
merge: provide *_ISLINK environment vars to merge helper
Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Wed, 03 Oct 2007 23:09:36 +0200 |
| parents | 1158d7018052 |
| children |
| rev | line source |
|---|---|
| 3942 | 1 Basic install: |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
2 |
| 3942 | 3 $ make # see install targets |
| 4 $ make install # do a system-wide install | |
| 5 $ hg debuginstall # sanity-check setup | |
| 6 $ hg # see help | |
|
205
d255d99a7cbd
README: integrate some changes from Kevin Smith
mpm@selenic.com
parents:
204
diff
changeset
|
7 |
| 3942 | 8 See http://www.selenic.com/mercurial/ for detailed installation |
| 9 instructions, platform-specific notes, and Mercurial user information. | |
| 327 | 10 |