pygit updated to 0.21.3
First steps to support merge strategies
Merge pull request #11 from jsoriano/pygit2-0.21.3

Pygit2 0.21 and merge strategies