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 |
---|
/genj/src/report/ReportCommonAncestor.java | 10 | 2 | 70 | 75 | -- | 0 | SM |
/genj/src/core/genj/util/swing/DateWidget.java | 4 | 2 | 9 | 4 | -- | 0 | SM |
/genj/src/core/genj/util/Origin.java | 1 | 1 | 10 | 10 | -- | 0 | SM |