remove unmerged files during reset hard
Merge pull request #1445 from ethomson/reset_unmerged

remove unmerged files during reset hard