0.11.0

This release adds handling of merge conflicts and the "combined" diff format which git uses for merge commits; see the Merge conflicts README section and #189. Please consider setting

[merge]
    conflictstyle = diff3

With that setting, when a merge conflict is encountered, delta will display diffs between the ancestral commit and each of the two merge parents:

PRs

• Handle combined diff format and merge conflicts by @dandavison in #812
• Handle failure to parse non hunk header by @dandavison in #823

Full Changelog: 0.10.3...0.11.0