Test Result : MergerTest

0 failures

35 tests

Took 2.8 sec.

All Tests

Test name	Duration	Status
checkContentMergeConflict	0.11 sec	Passed
checkContentMergeConflict_noTree	54 ms	Passed
checkContentMergeLargeBinaries	0.22 sec	Passed
checkContentMergeNoConflict	82 ms	Passed
checkContentMergeNoConflict_noRepo	69 ms	Passed
checkFileDirMergeConflictInVirtualAncestor_ConflictInChildren_DirFile	75 ms	Passed
checkFileDirMergeConflictInVirtualAncestor_ConflictInChildren_FileDir	0.14 sec	Passed
checkFileDirMergeConflictInVirtualAncestor_NoConflictInChildren	88 ms	Passed
checkFileReplacedByFolderInOurs	81 ms	Passed
checkFileReplacedByFolderInTheirs	0.1 sec	Passed
checkForCorrectIndex	95 ms	Passed
checkLockedFilesToBeDeleted	49 ms	Passed
checkMergeConflictInVirtualAncestor	77 ms	Passed
checkMergeConflictingFilesWithTreeInIndex	45 ms	Passed
checkMergeConflictingNewTrees	71 ms	Passed
checkMergeConflictingSubmodulesWithoutIndex	48 ms	Passed
checkMergeConflictingTreesWithoutIndex	77 ms	Passed
checkMergeCrissCross	96 ms	Passed
checkMergeDoesntCrashWithSpecialFileNames	55 ms	Passed
checkMergeEqualNewTrees	38 ms	Passed
checkMergeEqualTreesInCore	68 ms	Passed
checkMergeEqualTreesInCore_noRepo	47 ms	Passed
checkMergeEqualTreesWithoutIndex	50 ms	Passed
checkMergeMergeableFilesWithTreeInIndex	77 ms	Passed
checkMergeMergeableTreesWithoutIndex	86 ms	Passed
checkMergeNonConflictingSubmodulesWithoutIndex	0.1 sec	Passed
checkModeMergeConflictInVirtualAncestor	0.1 sec	Passed
checkUntrackedEmpytFolderIsNotAConflictWithFile	61 ms	Passed
checkUntrackedFolderIsNotAConflict	77 ms	Passed
failingDeleteOfDirectoryWithUntrackedContent	42 ms	Passed
fileBecomesDir_noTree	70 ms	Passed
mergeConflictWithCrLfTextAuto	0.11 sec	Passed
mergeWithCrlfAutoCrlfTrue	42 ms	Passed
mergeWithCrlfInWT	59 ms	Passed
rebaseWithCrlfAutoCrlfTrue	0.11 sec	Passed