magit-checkout-stage: remove commented code

We also should not limit completion to unmerged files; a user might
have already resolved conflicts and then wants to restore them.