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 |
---|
/org/gjt/sp/jedit/bufferio/BufferIORequest.java | 5 | 1 | 94 | 23 | -- | 0 | SM |
/org/gjt/sp/jedit/syntax/ParserRule.java | 5 | 5 | 10 | 10 | -- | 0 | SM |
/org/gjt/sp/jedit/MiscUtilities.java | 4 | 5 | 65 | 44 | -- | 0 | UM |