Show HN: ConflictFormatter – Format diff3-style merge conflicts (philippotto.github.io) 4 points by philippotto 9y ago ↗ HN
[–] dzolvd 9y ago ↗ Making the switch to diff3 revolutionized working with conflicts for me. This is a cool tool thanks for making and posting it.
1 comment
[ 7.7 ms ] story [ 88.0 ms ] thread