Live data from Hacker News

Show HN: ConflictFormatter – Format diff3-style merge conflicts

philippotto.github.io

Post reply on HN

Print view View original

1–2 of 2 posts

Show HN: ConflictFormatter – Format diff3-style merge conflicts

#1

Post by philippotto » Wed, May 03, 2017, 8:04 PM UTC

Show HN: ConflictFormatter – Format diff3-style merge conflicts
philippotto.github.io

Re: Show HN: ConflictFormatter – Format diff3-style merge conflicts

#2

Post by dzolvd » Wed, May 03, 2017, 8:14 PM UTC

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

Post reply on HN