Fix reset for staged deletes

Fix for #2260 

When calling `git_reset_default` on a file that has a staged delete, the call to `git_index_conflict_remove` may fail with `GIT_ENOTFOUND` but that error is okay and we should be able to proceed.

/cc @nulltoken - Does this fix seem correct?