Mercurial > hg
annotate contrib/win32/postinstall.txt @ 27048:86290f6f6599
mergestate._resolve: handle change/delete conflicts
We will represent a deleted file as 'nullhex' in the in-memory and on-disk
merge states. We need to be able to create absentfilectxes in that case, and
delete the file from disk rather than try to write it out.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Fri, 20 Nov 2015 01:14:15 -0800 |
parents | 4b0fc75f9403 |
children |
rev | line source |
---|---|
1289
8d24d85ff054
Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1 Welcome to Mercurial for Windows! |
8d24d85ff054
Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 --------------------------------- |
8d24d85ff054
Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 |
8d24d85ff054
Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 For configuration and usage directions, please read the ReadMe.html |
8d24d85ff054
Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
5 file that comes with this package. |
8d24d85ff054
Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 |
3863
1ef8ada4370f
Remove hard-coded version numbers and release notes from packaging
Matt Mackall <mpm@selenic.com>
parents:
2681
diff
changeset
|
7 Also check the release notes at: |
2276
766c3c852786
Update Windows release notes and install script for v0.9
Lee Cantey <lcantey@gmail.com>
parents:
2216
diff
changeset
|
8 |
26421
4b0fc75f9403
urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents:
8936
diff
changeset
|
9 https://mercurial-scm.org/wiki/WhatsNew |