checkout_index: handle other stages

When checking out an alternate index, drop other stage entries when adding a new file.  That is to say:  when we are checking out a conflict, make sure to remove the stage 0 entry for that file.  When we are checking out a stage 0 entry, make sure to remove the conflict for that file.