addall.c
13.6 KB
-
git_index_add_all: test that conflicts are handled · 666ae188
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.
Edward Thomson committed