Test Result : MergeToolTest
0 failures
12 tests
All Tests
Test name | Duration | Status |
---|---|---|
conflictUnderneathIgnoredFolder[linkingDisabled=false] | 1.7 sec | Passed |
conflictUnderneathIgnoredFolder[linkingDisabled=true] | 1.7 sec | Passed |
mergedOursVersionLongerMarkers[linkingDisabled=false] | 2 sec | Passed |
mergedOursVersionLongerMarkers[linkingDisabled=true] | 1.4 sec | Passed |
mergedOursVersion[linkingDisabled=false] | 1.9 sec | Passed |
mergedOursVersion[linkingDisabled=true] | 1.7 sec | Passed |
useHeadOptionOpenedAgainShouldHaveEdits[linkingDisabled=false] | 1.9 sec | Passed |
useHeadOptionOpenedAgainShouldHaveEdits[linkingDisabled=true] | 2 sec | Passed |
useHeadOptionShouldCauseFileToNotHaveConflictMarkers[linkingDisabled=false] | 1.1 sec | Passed |
useHeadOptionShouldCauseFileToNotHaveConflictMarkers[linkingDisabled=true] | 1.1 sec | Passed |
verifyCherrypickBase[linkingDisabled=false] | 1.1 sec | Passed |
verifyCherrypickBase[linkingDisabled=true] | 1.1 sec | Passed |