Settings

Theme

Show HN: ConflictFormatter – Format diff3-style merge conflicts

philippotto.github.io

4 points by philippotto 9 years ago · 1 comment

Reader

dzolvd 9 years ago

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

Keyboard Shortcuts

j
Next item
k
Previous item
o / Enter
Open selected item
?
Show this help
Esc
Close modal / clear selection