• Show log

    Commit

  • Hash : 6249d960
    Author : Edward Thomson
    Date : 2016-06-29T17:55:44

    index: include conflicts in `git_index_read_index`
    
    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.