diff options
| author | Edward Thomson <ethomson@github.com> | 2016-02-08 17:55:22 -0800 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-02-08 17:56:41 -0800 |
| commit | b00c959f45bfa8e2bb27bec0cfebc4bad5f70df2 (patch) | |
| tree | ba4871e00298717e7884eaa692fbaae69c908495 /src/commit.c | |
| parent | 7cdbb39e0a92d08d8c4edd827aeed81ffc74f1a4 (diff) | |
| download | libgit2-b00c959f45bfa8e2bb27bec0cfebc4bad5f70df2.tar.gz | |
Better document `git_merge_commits` redux
`git_merge_commits` and `git_merge` now *do* handle recursive base
building for criss-cross merges. Remove the documentation that says
that they do not.
This reverts commit 5e44d9bcb6d5b20922f49b1913723186f8ced8b5.
Diffstat (limited to 'src/commit.c')
0 files changed, 0 insertions, 0 deletions