Commit 239bdc57617271b577a9cbb7727e332a8aa1a07c

Carlos Martín Nieto 2015-01-05T21:28:30

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