diff options
| author | Edward Thomson <ethomson@github.com> | 2016-06-29 17:55:44 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-06-29 18:37:00 -0400 |
| commit | 6249d960ab2d968acd1a9d87986c81a12e2e96bc (patch) | |
| tree | 21d8d23bf8b67bee52619b136d45f592cd21cb74 /src/patch_parse.c | |
| parent | 6f7ec7283db8c105f6c08d333783c4a99476eeee (diff) | |
| download | libgit2-ethomson/read_index_conflicts.tar.gz | |
index: include conflicts in `git_index_read_index`ethomson/read_index_conflicts
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.
Diffstat (limited to 'src/patch_parse.c')
0 files changed, 0 insertions, 0 deletions