• Show log

    Commit

  • Hash : 666ae188
    Author : Edward Thomson
    Date : 2015-05-19T17:52:13

    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.