I built something to resolve merge conflicts in Devicetree Source files in a syntax aware way
https://codeberg.org/mergiraf/mergiraf/pulls/175
This commit adds language support for https://www.devicetree.org/ source files.
Funkeleinhorn
