mirror of
https://github.com/bluekeyes/go-gitdiff
synced 2026-06-08 13:18:30 +00:00
eb5f3de78c
Conflict errors are now represented by an exported type that is compatible with errors.Is instead of using the method defined on ApplyError. This makes the tests slightly cleaner and should be more idiomatic for clients.