[llvm] [DRAFT][clang-format] helper script for resolving downstream reformat… (PR #80462)

[Paul T Robinson via llvm-commits]

pogo59 wrote:

Thanks for the testing! I tried this on our downstream repo but only with purely reformatting changes, not with a commit that also had non-reformatting changes. I will do more experimenting with a conflict that has a non-reformatting conflict as well.

If I can't get that to work in the mergetool context, I believe it would be possible to write a fully standalone script that DTRT, it will just be tedious to extract the 3 versions of the file that git-mergetool hands you for free.

https://github.com/llvm/llvm-project/pull/80462