checkout_index: remove conflicts when checking out new files
checkout_index: Remove stage 0 when checking out conflicts
Merge pull request #2692 from ethomson/bug2515

checkout_index: handle other stages