Edmundo Carmona

Within `git_merge_file_from_index`, it should be possible to handle cases where either one of the children is `NULL`. - When a file is deleted, `ancestor` and one child will be set...

index: map git_index_conflict_add

2

map libgit2's `git_index_conflict_add()` as `Index.add_conflict()`.

Repository.merge_file_from_index - can't take a None as an argument

2

This is probably more of a libgit2 question but given that I am working on pygit2, I better start the conversation over here. I am working on writing unit tests...