libgit2 conflict resolve testing