3 ms·Diffconflicts: A better Vimdiff Git mergetool2 points by mzehrer 8y agomzehrer 8y agotl;dr: This converts a file containing conflict markers into a two-way diff. Claims that tow-way diffs are the better choice.