diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-05-19 18:29:15 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-05-28 09:47:51 -0400 |
| commit | 9b3e41f72bd9ab62e8d129713755c3a3a71359bc (patch) | |
| tree | bcd61051d920bf2568d5f45ab53a0dd31d662679 /include/git2 | |
| parent | 10549a2df166cd3b951c65ab89c33f7ef21c6b7a (diff) | |
| download | libgit2-9b3e41f72bd9ab62e8d129713755c3a3a71359bc.tar.gz | |
index_add_all: remove conflicts when no wd file
If there exists a conflict in the index, but no file in the working
directory, this implies that the user wants to accept the resolution
by removing the file. Thus, remove the conflict entry from the
index, instead of trying to add a (nonexistent) file.
Diffstat (limited to 'include/git2')
0 files changed, 0 insertions, 0 deletions