Show HN: ConflictFormatter – Format diff3-style merge conflicts (opens in new tab)

(philippotto.github.io)

4 pointsphilippotto8y ago1 comments

1 comments

Making the switch to diff3 revolutionized working with conflicts for me. This is a cool tool thanks for making and posting it.

j / k navigate · click thread line to collapse

(philippotto.github.io)

4 pointsphilippotto8y ago1 comments

Making the switch to diff3 revolutionized working with conflicts for me. This is a cool tool thanks for making and posting it.

j / k navigate · click thread line to collapse