]> git.proxmox.com Git - libgit2.git/commit - tests/index/conflicts.h
Merge pull request #3847 from libgit2/ethomson/read_index_conflicts
authorEdward Thomson <ethomson@github.com>
Thu, 30 Jun 2016 14:20:32 +0000 (10:20 -0400)
committerGitHub <noreply@github.com>
Thu, 30 Jun 2016 14:20:32 +0000 (10:20 -0400)
commite4218450338cf6757077f63bac570ea77f655eff
tree21d8d23bf8b67bee52619b136d45f592cd21cb74
parent59a0005ddd981a582fea4411d272dce53e1f6f1f
parent6249d960ab2d968acd1a9d87986c81a12e2e96bc
Merge pull request #3847 from libgit2/ethomson/read_index_conflicts

Include conflicts in `git_index_read_index`