philippotto/ConflictFormatter
Format a diff3-style merge conflict by showing its underlying changes separately.
JavaScriptMIT
Issues
- 0
Show branch name in diff view
#4 opened by fm3 - 1
- 1
Wider display
#1 opened by silidev
Format a diff3-style merge conflict by showing its underlying changes separately.
JavaScriptMIT