Fix test failures introduced by PR #113697 (#116941)
[llvm-project.git] / clang-tools-extra / test / clang-apply-replacements / Inputs / ignore-conflict / 
tree324d0630bf8f02369baf22962da563e4b8c6c7a7
drwxr-xr-x   ..
-rw-r--r-- 733 file1.yaml
-rw-r--r-- 104 ignore-conflict.cpp