philippotto / ConflictFormatter Public

Notifications You must be signed in to change notification settings
Fork 2
Star 10

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

10 stars 2 forks Branches Tags Activity

Notifications

Name		Name	Last commit message	Last commit date
Latest commit History 18 Commits
diff2html		diff2html
jsdiff		jsdiff
LICENSE		LICENSE
README.md		README.md
index.html		index.html
main.css		main.css
main.js		main.js

Repository files navigation

ConflictFormatter

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

About

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

Report repository

Releases

No releases published

Packages

No packages published

Contributors 2

Languages