4 ms·Show HN: ConflictFormatter – Format diff3-style merge conflicts4 points by philippotto 9y agodzolvd 9y agoMaking the switch to diff3 revolutionized working with conflicts for me. This is a cool tool thanks for making and posting it.