In theory you can plug any three-way merge tool into git. I’d love to see merge tools that are syntax aware and can merge asts more than line text.