![[Jenkins]](/jgit/static/d3963bb7/images/svgs/logo.svg){kind=logo}
Test Result : SimpleMergeTest
0 failures
16 tests
All Tests
| Test name | Duration | Status |
|---|---|---|
| testOurs | 4 ms | Passed |
| testOurs_noRepo | 7 ms | Passed |
| testTheirs | 8 ms | Passed |
| testTheirs_noRepo | 6 ms | Passed |
| testTrivialTwoWay | 5 ms | Passed |
| testTrivialTwoWay_concurrentSubtreeChange | 44 ms | Passed |
| testTrivialTwoWay_conflict | 8 ms | Passed |
| testTrivialTwoWay_conflictSubtreeChange | 15 ms | Passed |
| testTrivialTwoWay_disjointhistories | 7 ms | Passed |
| testTrivialTwoWay_leftDFconflict1 | 9 ms | Passed |
| testTrivialTwoWay_leftDFconflict2 | 8 ms | Passed |
| testTrivialTwoWay_noRepo | 5 ms | Passed |
| testTrivialTwoWay_ok | 5 ms | Passed |
| testTrivialTwoWay_rightDFconflict1 | 9 ms | Passed |
| testTrivialTwoWay_rightDFconflict2 | 8 ms | Passed |
| testTrivialTwoWay_validSubtreeSort | 9 ms | Passed |