delta/libgit2.git/tests/index/conflicts.h, branch ethomson/https_proxy github.com: libgit2/libgit2.git index: include conflicts in `git_index_read_index` 2016-06-29T22:37:00+00:00 Edward Thomson ethomson@github.com 2016-06-29T21:55:44+00:00 6249d960ab2d968acd1a9d87986c81a12e2e96bc Ensure that we include conflicts when calling `git_index_read_index`, which will remove conflicts in the index that do not exist in the new target, and will add conflicts from the new target. 
Ensure that we include conflicts when calling `git_index_read_index`,
which will remove conflicts in the index that do not exist in the new
target, and will add conflicts from the new target.