| testAlreadyUpToDate | 7 ms | Passed |
| testBinaryContentMerge | 19 ms | Passed |
| testBinaryContentMergeXours | 15 ms | Passed |
| testBinaryContentMergeXtheirs | 16 ms | Passed |
| testConflictingMergeFailsDueToDirtyIndex | 15 ms | Passed |
| testConflictingMergeFailsDueToDirtyWorktree | 14 ms | Passed |
| testContentMerge | 20 ms | Passed |
| testContentMergeXours | 19 ms | Passed |
| testContentMergeXtheirs | 18 ms | Passed |
| testDeletionAndConflict | 17 ms | Passed |
| testDeletionOnMasterConflict | 18 ms | Passed |
| testDeletionOnMasterOurs | 13 ms | Passed |
| testDeletionOnMasterTheirs | 13 ms | Passed |
| testDeletionOnSideConflict | 22 ms | Passed |
| testDeletionOnSideOurs | 14 ms | Passed |
| testDeletionOnSideTheirs | 13 ms | Passed |
| testFastForward | 8 ms | Passed |
| testFastForwardNoCommit | 8 ms | Passed |
| testFastForwardOnly | 8 ms | Passed |
| testFastForwardOnlyNotPossible | 10 ms | Passed |
| testFastForwardWithFiles | 10 ms | Passed |
| testFileModeMerge | 13 ms | Passed |
| testFileModeMergeWithDirtyWorkTree | 12 ms | Passed |
| testMergeConflictFileFolder | 15 ms | Passed |
| testMergeConflictWithMessageAndCommentChar | 13 ms | Passed |
| testMergeConflictWithMessageAndCommentCharAuto | 14 ms | Passed |
| testMergeConflictWithMessageOption | 15 ms | Passed |
| testMergeFailingWithDirtyWorkingTree | 13 ms | Passed |
| testMergeInItself | 5 ms | Passed |
| testMergeMessage | 15 ms | Passed |
| testMergeNonVersionedPaths | 19 ms | Passed |
| testMergeRemovingFolders | 11 ms | Passed |
| testMergeRemovingFoldersWithoutFastForward | 16 ms | Passed |
| testMergeSuccessAllStrategies | 62 ms | Passed |
| testMergeSuccessAllStrategiesNoCommit | 56 ms | Passed |
| testMergeTag | 17 ms | Passed |
| testMergeWithChangeId | 14 ms | Passed |
| testMergeWithMessageAndChangeId | 15 ms | Passed |
| testMergeWithMessageOption | 14 ms | Passed |
| testModifiedAndRenamed | 16 ms | Passed |
| testMultipleCreations | 13 ms | Passed |
| testMultipleCreationsSameContent | 14 ms | Passed |
| testMultipleDeletions | 13 ms | Passed |
| testMultipleHeads | 11 ms | Passed |
| testNoFastForward | 11 ms | Passed |
| testNoFastForwardNoCommit | 8 ms | Passed |
| testRecursiveMergeWithConflict | 15 ms | Passed |
| testSingleDeletion | 22 ms | Passed |
| testSquashFastForward | 15 ms | Passed |
| testSquashMerge | 15 ms | Passed |
| testSquashMergeConflict | 15 ms | Passed |
| testSuccessfulContentMerge | 28 ms | Passed |
| testSuccessfulContentMergeAndDirtyworkingTree | 20 ms | Passed |
| testSuccessfulContentMergeNoCommit | 17 ms | Passed |
| testSuccessfulMergeFailsDueToDirtyIndex | 14 ms | Passed |
| testSuccessfulMergeFailsDueToDirtyWorktree | 13 ms | Passed |
![[Jenkins]](/jgit/static/d3963bb7/images/svgs/logo.svg){kind=logo}
