Merge pull request #1111 from ethomson/conflictstatus status should ignore conflicts entries in the index
2012-12-03T13:20:39