Fix test failures introduced by PR #113697 (#116941)
[llvm-project.git] / clang-tools-extra / test / clang-apply-replacements / Inputs / conflict / 
treed1f30c292aaa60918af98e3da3087a9e3f38f476
drwxr-xr-x   ..
-rw-r--r-- 208 common.h
-rw-r--r-- 670 expected.txt
-rw-r--r-- 618 file1.yaml
-rw-r--r-- 628 file2.yaml
-rw-r--r-- 341 file3.yaml