Commit 18a477e7557b35987c33e0ada88702decac4b457

Edward Thomson 2022-02-02T22:35:07

Merge pull request #6195 from libgit2/ethomson/zdiff3 merge: support zdiff3 conflict styles