[all-commits] [llvm/llvm-project] 597884: Fix clang-format bug when handling conflict markers.

[r4nt via All-commits]

  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: 59788422609433c50c3d3c16ca531fa56b9acb4f
      https://github.com/llvm/llvm-project/commit/59788422609433c50c3d3c16ca531fa56b9acb4f
  Author: Manuel Klimek <klimek at google.com>
  Date:   2021-12-01 (Wed, 01 Dec 2021)

  Changed paths:
    M clang/lib/Format/UnwrappedLineParser.cpp
    M clang/unittests/Format/FormatTest.cpp

  Log Message:
  -----------
  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.