Comment by steerablesafe

What would be also cool is a syntax aware custom merge driver for git, but that's probably even harder.