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 |
---|
/source/org/jfree/chart/plot/PiePlot.java | 2 | 1 | 15 | 1 | -- | 0 | SM |
/tests/org/jfree/chart/axis/junit/LogAxisTests.java | 1 | 0 | 412 | 0 | -- | 0 | SM |
/source/org/jfree/chart/renderer/xy/XYSplineAndShapeRenderer.java | 1 | 0 | 312 | 0 | -- | 0 | SM |
/source/org/jfree/chart/editor/DefaultColorBarEditor.java | 1 | 0 | 111 | 0 | -- | 0 | SM |
/source/org/jfree/chart/axis/CategoryAxis.java | 1 | 0 | 24 | 0 | -- | 0 | SM |
/source/org/jfree/chart/plot/CategoryPlot.java | 1 | 0 | 15 | 0 | -- | 0 | SM |
/source/org/jfree/chart/plot/XYPlot.java | 1 | 0 | 6 | 0 | -- | 0 | SM |
/source/org/jfree/chart/labels/StandardPieToolTipGenerator.java | 1 | 0 | 4 | 0 | -- | 0 | SM |
/source/org/jfree/data/statistics/DefaultBoxAndWhiskerCategoryDataset.java | 1 | 0 | 2 | 0 | -- | 0 | SM |
/source/org/jfree/chart/renderer/category/MinMaxCategoryRenderer.java | 1 | 0 | 2 | 0 | -- | 0 | SM |
/source/org/jfree/chart/renderer/category/StatisticalBarRenderer.java | 3 | 3 | 84 | 82 | -- | 0 | SM |
/source/org/jfree/chart/axis/LogAxis.java | 1 | 1 | 932 | 30 | -- | 0 | SM |
/source/org/jfree/chart/renderer/category/StatisticalLineAndShapeRenderer.java | 1 | 1 | 6 | 6 | -- | 0 | SM |
/source/org/jfree/chart/axis/ValueAxis.java | 0 | 1 | 0 | 71 | -- | 0 | UM |
/source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java | 3 | 5 | 18 | 19 | -- | 0 | UM |