libgit2/libgit2sharp — pull request #643 by jamill (2014-03-04 17:50:59+00:00)
Title: Expand Merge API.

This includes refactoring of the merge logic to support different merge workflows, including pull.

Also adds a simple repository to perform merges in, simplying test logic.