P philippotto.github.io Show HN: ConflictFormatter – Format diff3-style merge conflicts 4 points philippotto 9 years ago 1 comments
