Aborting a merge will delete new files added

Hi!

While sorting out a merge conflict I accidentally added an untracked
folder to the index. Later I decided to abort the merge with `git
merge --abort` and I expected it to unstage the untracked file but it
instead removed it. This was not what I expected.

Cheers,
Pärham