diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-05-19 17:52:13 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-05-28 09:47:43 -0400 |
| commit | 666ae188215557fb440b74f6af6e5cfbec27d459 (patch) | |
| tree | 138a1b28c4815685d215912482a83d04e3d9ed20 /include/git2/diff.h | |
| parent | 1c4b5cee0079f61c9fad77f8954a873d91f6d81a (diff) | |
| download | libgit2-666ae188215557fb440b74f6af6e5cfbec27d459.tar.gz | |
git_index_add_all: test that conflicts are handled
When confronted with a conflict in the index, `git_index_add_all`
should stage the working directory copy. If there is no file in the
working directory, the conflict should simply be removed.
Diffstat (limited to 'include/git2/diff.h')
0 files changed, 0 insertions, 0 deletions