Mercurial > hg

diff tests/bruterebase.py @ 35324:72fbdd373de8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 bab82c43c065
children 3b98ffd2dde3
line wrap: on
line diff