diff options
| author | Edward Thomson <ethomson@github.com> | 2016-06-30 10:20:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-30 10:20:32 -0400 |
| commit | e4218450338cf6757077f63bac570ea77f655eff (patch) | |
| tree | 21d8d23bf8b67bee52619b136d45f592cd21cb74 /include/git2 | |
| parent | 59a0005ddd981a582fea4411d272dce53e1f6f1f (diff) | |
| parent | 6249d960ab2d968acd1a9d87986c81a12e2e96bc (diff) | |
| download | libgit2-e4218450338cf6757077f63bac570ea77f655eff.tar.gz | |
Merge pull request #3847 from libgit2/ethomson/read_index_conflicts
Include conflicts in `git_index_read_index`
Diffstat (limited to 'include/git2')
0 files changed, 0 insertions, 0 deletions