Merging with untracked files

Created originally on Bitbucket by Chris Stuhr

With the 2.3 version its seems there was a change of behavior when doing merges with a repository with untracked files in the workspace. Before 2.3 untracked files didn't interfere with a merge. But on 2.3 when doing a merge any untracked files in the workspace will get added instead of remaining untracked. Was this an intended change? It seems like this is a result of adding the --addremove option to all commits for issue #485 (closed).