[karlding]

There's the commercial SemanticMerge [0] which might work if it has a parser for the language that you use. According to their docs they currently only support C#, Java, C, C++ and PHP [1].

[0] https://www.semanticmerge.com/

[1] https://www.semanticmerge.com/features