Mercurial > hg
view .clang-format @ 39132:873f3a56993f
context: make sure file is not deleted while checking path conflicts
If a file is deleted and a directory of same name is created in the same commit,
IMM thinks of that as a file conflict, however the file is deleted and hence the
directory can be created.
The test change demonstrate the fix.
Differential Revision: https://phab.mercurial-scm.org/D4300
author | Pulkit Goyal <pulkit@yandex-team.ru> |
---|---|
date | Thu, 16 Aug 2018 16:59:40 +0300 |
parents | d0a3fa849cb8 |
children |
line wrap: on
line source
BasedOnStyle: LLVM IndentWidth: 8 UseTab: ForIndentation BreakBeforeBraces: Linux AllowShortIfStatementsOnASingleLine: false IndentCaseLabels: false AllowShortBlocksOnASingleLine: false AllowShortFunctionsOnASingleLine: false IncludeCategories: - Regex: '^<' Priority: 1 - Regex: '^"' Priority: 2