Skip to content

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

License

philippotto/ConflictFormatter

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

18 Commits
 
 
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

About

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

Resources

License

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published

Contributors 2

  •  
  •