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/bufferset/BufferSetManager.java | 11 | 7 | 127 | 159 | -- | 0 | SM |
/org/gjt/sp/jedit/bufferset/BufferSet.java | 4 | 1 | 9 | 15 | -- | 0 | SM |
/org/gjt/sp/jedit/View.java | 2 | 2 | 7 | 7 | -- | 0 | SM |
/org/gjt/sp/jedit/Buffer.java | 1 | 1 | 33 | 33 | -- | 0 | SM |
/org/gjt/sp/jedit/EditPane.java | 1 | 1 | 1 | 35 | -- | 0 | UM |
/org/gjt/sp/jedit/gui/statusbar/BufferSetWidgetFactory.java | 2 | 2 | 15 | 56 | -- | 0 | UM |