Commit 463f53513fd79a0e0bc59ee9a2ed8f4bc948a2e9

Carlos Martín Nieto 2016-02-09T06:26:21

Merge pull request #3601 from ethomson/merge_doc Better document `git_merge_commits` redux