search

bmwill / diffy

Tools for finding and manipulating differences between files
Apache License 2.0
75 stars 22 forks source link

merge: correctly identify conflicts #30

Closed bmwill closed 4 months ago

bmwill commented 4 months ago

Fix a bug and correctly identify merge conflicts between inserts and deletes.