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.
| C | CL | SC | CM |
---|
File | UM | SM | UM | SM | UM | SM |
---|
/UI/Linux/LinuxClient/library/iFolderWindow.cs | 4 | 4 | 86 | 86 | -- | 0 | SM |
/UI/Windows/FormsTrayApp/GlobalProperties.cs | 4 | 4 | 20 | 20 | -- | 0 | SM |
/UI/Linux/LinuxClient/library/AddAccountWizard.cs | 1 | 1 | 28 | 28 | -- | 0 | SM |
/UI/Linux/LinuxClient/library/KeyRecoveryWizard.cs | 1 | 1 | 6 | 6 | -- | 0 | SM |
/UI/Windows/FormsTrayApp/KeyRecovery/EnterPassphrasePage.cs | 1 | 1 | 4 | 4 | -- | 0 | SM |