Commit b2414661332f7fd6a6819395f1505a58f8d75b5e

Edward Thomson 2012-11-28T22:43:55

status should ignore conflicts entries in the index