Mercurial > hg
comparison tests/sitecustomize.py @ 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 | 031947baf4d0 |
children | b12bda49c3e3 |
comparison
equal
deleted
inserted
replaced
27047:e1458049dca5 | 27048:86290f6f6599 |
---|