libgit2/pygit2 — pull request #98 by petrh (2012-05-30 19:50:46+00:00)
Title: Support for diff merge operation

Merge on diff objects is now supported.

```python
from pygit2 import Repository

repo = Repository('/tmp/dirtyrepo')
head = repo[repo.lookup_reference('HEAD').resolve().oid]
tree = head.tree
diff_index = tree.diff(repo.index)
diff_work = tree.diff()

diff_index.merge(diff_work)
```