Mercurial > hg
comparison tests/test-rebase-interruptions.t @ 35324:72fbdd373de8
overlayworkingctx: add _auditconflicts to write()
Alas, part of Mercurial's conflict detection (for file<->folder conflicts,
for example) depends on the filesystem. We don't have the filesystem with IMM,
so we have to run these checks ourselves.
Differential Revision: https://phab.mercurial-scm.org/D1241
| author | Phil Cohen <phillco@fb.com> |
|---|---|
| date | Thu, 07 Dec 2017 16:07:06 -0800 |
| parents | 3b7cb3d17137 |
| children | 469b06b4c3ca |
comparison
equal
deleted
inserted
replaced
| 35323:8e1386b342f7 | 35324:72fbdd373de8 |
|---|