1Show HN: ConflictFormatter – Format diff3-style merge conflicts (opens in new tab)(philippotto.github.io)4philippotto8y ago1