Results of semistructured (SM) and unstructured merge (UM) in revision : conflicts (C), conflicting lines of code (CL) and semantic conflicts (SC).
Yellow boxes indicate better results of unstructured merge. CM column dislays which kind is selected for combined conflict merge.
CCLSCCM
FileUMSMUMSMUMSM
/project/UnitTests/IntegrationTests/PreprocessorTest.cs103660--0SM
/project/core/tasks/TaskBase.cs1060--0SM