Test Result : MergeToolTest

0 failures

12 tests

All Tests

Test name	Duration	Status
conflictUnderneathIgnoredFolder[linkingDisabled=false]	1.3 sec	Passed
conflictUnderneathIgnoredFolder[linkingDisabled=true]	1.3 sec	Passed
mergedOursVersionLongerMarkers[linkingDisabled=false]	1.8 sec	Passed
mergedOursVersionLongerMarkers[linkingDisabled=true]	1.8 sec	Passed
mergedOursVersion[linkingDisabled=false]	1.5 sec	Passed
mergedOursVersion[linkingDisabled=true]	1.6 sec	Passed
useHeadOptionOpenedAgainShouldHaveEdits[linkingDisabled=false]	2.3 sec	Passed
useHeadOptionOpenedAgainShouldHaveEdits[linkingDisabled=true]	2.4 sec	Passed
useHeadOptionShouldCauseFileToNotHaveConflictMarkers[linkingDisabled=false]	1.6 sec	Passed
useHeadOptionShouldCauseFileToNotHaveConflictMarkers[linkingDisabled=true]	1.1 sec	Passed
verifyCherrypickBase[linkingDisabled=false]	1.6 sec	Passed
verifyCherrypickBase[linkingDisabled=true]	1.6 sec	Passed