From: Pärham FH <parhamfh@kth.se>
Date: Fri, 01 Dec 2017 11:58:45 GMT
Subject: Aborting a merge will delete new files added
Message-ID: <CAM-FauOP_FG=N=npVhuKdiYATDAGxeP+q+qud3-X3g99=g_mBQ@mail.gmail.com>

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