• Show log

    Commit

  • Hash : b2414661
    Author : Edward Thomson
    Date : 2012-11-28T22:43:55

    status should ignore conflicts entries in the index