Fix switching to a branch with D/F when current branch has file D.