Format a diff3-style merge conflict by showing its underlying changes separately.
Primary LanguageJavaScriptMIT LicenseMIT