comparison tests/test-merge-tools.t @ 34833:07bbb208a924

context: audit paths before clearing unknown files and dirs Fix regression introduced in D785. In some circumstances, context.clearunknown can be called before the path is audited. Audit the path before deleting any conflicting files. Differential Revision: https://phab.mercurial-scm.org/D1157
author Mark Thomas <mbthomas@fb.com>
date Tue, 17 Oct 2017 08:11:13 -0700
parents 9bc36198338e
children 41ef02ba329b
comparison
equal deleted inserted replaced
34832:d6009d1488e8 34833:07bbb208a924