Commit 85a41fc4bf148dc954fa8124b61355ee648c40ba

Vicent Marti 2014-03-24T18:09:13

Merge pull request #2183 from ethomson/merge_refactor Refactor the `git_merge` API