Add or update index entries to represent a conflict. Any staged
entries that exist at the given paths will be removed.
The entries are the entries from the tree included in the merge. Any
entry may be null to indicate that that file was not present in the
trees during the merge. For example, ancestor_entry may be null to
indicate that a file was added in both branches and must be resolved.
@param index an existing index object
@param ancestor_entry the entry data for the ancestor of the conflict
@param our_entry the entry data for our side of the merge conflict
@param their_entry the entry data for their side of the merge conflict
@return 0 or an error code
Add or update index entries to represent a conflict. Any staged entries that exist at the given paths will be removed.
The entries are the entries from the tree included in the merge. Any entry may be null to indicate that that file was not present in the trees during the merge. For example, ancestor_entry may be null to indicate that a file was added in both branches and must be resolved.
@param index an existing index object @param ancestor_entry the entry data for the ancestor of the conflict @param our_entry the entry data for our side of the merge conflict @param their_entry the entry data for their side of the merge conflict @return 0 or an error code