Test Result : MergeCommandTest

0 failures

45 tests

Took 1.6 sec.

All Tests

Test name	Duration	Status
testAlreadyUpToDate	15 ms	Passed
testConflictingMergeFailsDueToDirtyIndex	36 ms	Passed
testConflictingMergeFailsDueToDirtyWorktree	31 ms	Passed
testContentMerge	59 ms	Passed
testDeletionAndConflict	32 ms	Passed
testDeletionOnMasterConflict	32 ms	Passed
testDeletionOnSideConflict	36 ms	Passed
testFastForward	16 ms	Passed
testFastForwardNoCommit	16 ms	Passed
testFastForwardOnly	15 ms	Passed
testFastForwardOnlyNotPossible	28 ms	Passed
testFastForwardWithFiles	19 ms	Passed
testFileModeMerge	25 ms	Passed
testFileModeMergeWithDirtyWorkTree	32 ms	Passed
testMergeConflictFileFolder	41 ms	Passed
testMergeConflictWithMessageOption	62 ms	Passed
testMergeFailingWithDirtyWorkingTree	25 ms	Passed
testMergeInItself	9 ms	Passed
testMergeMessage	50 ms	Passed
testMergeNonVersionedPaths	41 ms	Passed
testMergeRemovingFolders	20 ms	Passed
testMergeRemovingFoldersWithoutFastForward	29 ms	Passed
testMergeSuccessAllStrategies	0.13 sec	Passed
testMergeSuccessAllStrategiesNoCommit	0.13 sec	Passed
testMergeTag	31 ms	Passed
testMergeWithChangeId	28 ms	Passed
testMergeWithMessageAndChangeId	28 ms	Passed
testMergeWithMessageOption	30 ms	Passed
testModifiedAndRenamed	49 ms	Passed
testMultipleCreations	24 ms	Passed
testMultipleCreationsSameContent	26 ms	Passed
testMultipleDeletions	33 ms	Passed
testMultipleHeads	23 ms	Passed
testNoFastForward	21 ms	Passed
testNoFastForwardNoCommit	16 ms	Passed
testRecursiveMergeWithConflict	27 ms	Passed
testSingleDeletion	54 ms	Passed
testSquashFastForward	25 ms	Passed
testSquashMerge	35 ms	Passed
testSquashMergeConflict	28 ms	Passed
testSuccessfulContentMerge	38 ms	Passed
testSuccessfulContentMergeAndDirtyworkingTree	51 ms	Passed
testSuccessfulContentMergeNoCommit	35 ms	Passed
testSuccessfulMergeFailsDueToDirtyIndex	50 ms	Passed
testSuccessfulMergeFailsDueToDirtyWorktree	46 ms	Passed