Mercurial > hg
view 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 |
line wrap: on
line source
Welcome to Mercurial for Windows! --------------------------------- For configuration and usage directions, please read the ReadMe.html file that comes with this package. Also check the release notes at: https://mercurial-scm.org/wiki/WhatsNew