Properly recognize unmerged file state (fix #209)