As far as I understand, this only resolves conflicts, git can already resolve with it's line-based approach. I'm talking about conflicts within a single line, that a line based approach cannot solve.