![[Jenkins]](/jgit/static/89930799/images/svgs/logo.svg){kind=logo}
Test Result : MergeGitAttributeTest
0 failures
, 1 skipped
7 tests
All Tests
| Test name | Duration | Status |
|---|---|---|
| mergeBinaryFile_NoAttr_Conflict | 0 ms | Skipped |
| mergeBinaryFile_SetMerge_Conflict | 97 ms | Passed |
| mergeBinaryFile_UnsetMerge_Conflict | 92 ms | Passed |
| mergeTextualFile_NoAttr | 90 ms | Passed |
| mergeTextualFile_SetBinaryMerge_Conflict | 61 ms | Passed |
| mergeTextualFile_UnsetMerge_Conflict | 0.1 sec | Passed |
| mergeTextualFile_UnsetMerge_NoConflict | 0.1 sec | Passed |