Format a diff3-style merge conflict by showing its underlying changes separately. Read more and try it out!
philippotto/ConflictFormatter
Format a diff3-style merge conflict by showing its underlying changes separately.
JavaScriptMIT
Format a diff3-style merge conflict by showing its underlying changes separately.
JavaScriptMIT
Format a diff3-style merge conflict by showing its underlying changes separately. Read more and try it out!