Added test case to illustrate bogus conflicts detected if no files were merged, and untracked files exist in the workdir.
2014-09-12T21:59:09