Test Result : MergeGitAttributeTest

0 failures , 1 skipped

7 tests

All Tests

Test name	Duration	Status
mergeBinaryFile_NoAttr_Conflict	0 ms	Skipped
mergeBinaryFile_SetMerge_Conflict	0.12 sec	Passed
mergeBinaryFile_UnsetMerge_Conflict	0.11 sec	Passed
mergeTextualFile_NoAttr	0.17 sec	Passed
mergeTextualFile_SetBinaryMerge_Conflict	1.4 sec	Passed
mergeTextualFile_UnsetMerge_Conflict	0.17 sec	Passed
mergeTextualFile_UnsetMerge_NoConflict	0.19 sec	Passed