• Show log

    Commit

  • Hash : 96d799aa
    Author : Edward Thomson
    Date : 2013-07-23T15:32:42

    checkout rename conflicts rename conflict tests for checkout conflicts, don't suffix filenames when checking out with USE_OURS or USE_THEIRS