8 ms·What would be also cool is a syntax aware custom merge driver for git, but that's probably even harder.by steerablesafe 4y agoWhat would be also cool is a syntax aware custom merge driver for git, but that's probably even harder.