| commit | 36605ea2f0d0cfd40fbdfa90ab7083c0b4bc4b4b | [log] [tgz] |
|---|---|---|
| author | Manuel Klimek <klimek@google.com> | Wed Dec 01 11:19:19 2021 +0100 |
| committer | Copybara-Service <copybara-worker@google.com> | Wed Dec 01 02:27:09 2021 -0800 |
| tree | 883154e7c96706c460c34f9ea5719dec4f36ddf4 | |
| parent | 1d8845ce47f54b53110cf5b655ef9a28f96222ef [diff] |
Fix clang-format bug when handling conflict markers. Previously, clang-format would not correctly identify preprocessor directives directly following a conflict marker, which would result in violating the formatter's invariants. The provided test fails in assert mode before this change. GitOrigin-RevId: 59788422609433c50c3d3c16ca531fa56b9acb4f