• Show log

    Commit

  • Hash : 42f98a26
    Author : Edward Thomson
    Date : 2015-01-17T23:31:24

    merge test: test an actual failure, not conflict Correct the merge failed cleanup test. Merge data should not be cleaned up on conflicts, only on actual failure. And ORIG_HEAD should not be removed at all.