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/renderer/category/StatisticalBarRenderer.java | 8 | 7 | 144 | 128 | -- | 0 | SM |
| /swt/org/jfree/experimental/chart/swt/ChartComposite.java | 7 | 3 | 592 | 76 | -- | 0 | SM |
| /source/org/jfree/data/DefaultKeyedValues.java | 4 | 2 | 36 | 26 | -- | 0 | SM |
| /source/org/jfree/chart/plot/PiePlot.java | 3 | 2 | 157 | 143 | -- | 0 | SM |
| /source/org/jfree/chart/plot/CategoryPlot.java | 3 | 2 | 109 | 70 | -- | 0 | SM |
| /source/org/jfree/chart/plot/dial/StandardDialScale.java | 1 | 0 | 807 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/plot/dial/DialPlot.java | 1 | 0 | 768 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/plot/dial/DialValueIndicator.java | 1 | 0 | 599 | 0 | -- | 0 | SM |
| /tests/org/jfree/chart/axis/junit/LogAxisTests.java | 1 | 0 | 412 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/plot/dial/StandardDialRange.java | 1 | 0 | 357 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/plot/dial/DialTextAnnotation.java | 1 | 0 | 325 | 0 | -- | 0 | SM |
| /tests/org/jfree/chart/plot/dial/junit/DialValueIndicatorTests.java | 1 | 0 | 272 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/plot/dial/DialCap.java | 1 | 0 | 261 | 0 | -- | 0 | SM |
| /tests/org/jfree/chart/plot/dial/junit/DialBackgroundTests.java | 1 | 0 | 244 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/plot/dial/AbstractDialLayer.java | 1 | 0 | 128 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/editor/DefaultColorBarEditor.java | 1 | 0 | 111 | 0 | -- | 0 | SM |
| /experimental/org/jfree/experimental/chart/demo/LogAxisDemo1.java | 1 | 0 | 62 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/encoders/KeypointPNGEncoderAdapter.java | 1 | 0 | 41 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/axis/CategoryAxis.java | 1 | 0 | 24 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/editor/DefaultTitleEditor.java | 1 | 0 | 8 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/xy/XYLineAndShapeRenderer.java | 1 | 0 | 7 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/xy/CandlestickRenderer.java | 1 | 0 | 5 | 0 | -- | 0 | SM |
| /source/org/jfree/data/statistics/DefaultBoxAndWhiskerCategoryDataset.java | 1 | 0 | 4 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/xy/XYDotRenderer.java | 1 | 0 | 4 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/labels/StandardPieToolTipGenerator.java | 1 | 0 | 4 | 0 | -- | 0 | SM |
| /source/org/jfree/data/statistics/DefaultStatisticalCategoryDataset.java | 1 | 0 | 3 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/category/MinMaxCategoryRenderer.java | 1 | 0 | 2 | 0 | -- | 0 | SM |
| /source/org/jfree/chart/resources/JFreeChartResources.java | 1 | 0 | 2 | 0 | -- | 1 | SM |
| /swt/org/jfree/experimental/chart/swt/editor/SWTAxisEditor.java | 6 | 6 | 42 | 42 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/AbstractRenderer.java | 6 | 6 | 30 | 30 | -- | 0 | SM |
| /source/org/jfree/chart/plot/XYPlot.java | 2 | 2 | 94 | 70 | -- | 0 | SM |
| /source/org/jfree/chart/plot/dial/DialPointer.java | 1 | 1 | 453 | 11 | -- | 0 | SM |
| /source/org/jfree/data/statistics/DefaultMultiValueCategoryDataset.java | 1 | 1 | 366 | 18 | -- | 0 | SM |
| /source/org/jfree/chart/plot/dial/StandardDialFrame.java | 1 | 1 | 295 | 16 | -- | 0 | SM |
| /source/org/jfree/chart/ChartFactory.java | 1 | 1 | 138 | 138 | -- | 0 | SM |
| /source/org/jfree/chart/plot/PolarPlot.java | 1 | 1 | 24 | 24 | -- | 0 | SM |
| /swt/org/jfree/experimental/chart/swt/editor/SWTTitleEditor.java | 1 | 1 | 14 | 14 | -- | 0 | SM |
| /source/org/jfree/chart/plot/PiePlot3D.java | 1 | 1 | 14 | 14 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/xy/XYAreaRenderer.java | 1 | 1 | 6 | 6 | -- | 0 | SM |
| /source/org/jfree/chart/renderer/category/StatisticalLineAndShapeRenderer.java | 1 | 1 | 6 | 6 | -- | 0 | SM |
| /source/org/jfree/chart/editor/DefaultPlotEditor.java | 1 | 1 | 5 | 5 | -- | 0 | SM |
| /source/org/jfree/chart/plot/ThermometerPlot.java | 1 | 1 | 3 | 3 | -- | 0 | SM |
| /source/org/jfree/chart/axis/PeriodAxisLabelInfo.java | 1 | 1 | 3 | 3 | -- | 0 | SM |
| /tests/org/jfree/data/statistics/junit/DataStatisticsPackageTests.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /tests/org/jfree/chart/renderer/xy/junit/RendererXYPackageTests.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /tests/org/jfree/chart/entity/junit/EntityPackageTests.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /source/org/jfree/chart/axis/ValueAxis.java | 1 | 1 | 3 | 72 | -- | 0 | UM |
| /source/org/jfree/chart/plot/dial/DialBackground.java | 1 | 2 | 198 | 33 | -- | 0 | UM |
| /source/org/jfree/chart/plot/dial/ArcDialFrame.java | 1 | 2 | 453 | 78 | -- | 0 | UM |
| /source/org/jfree/chart/renderer/category/ScatterRenderer.java | 1 | 2 | 504 | 123 | -- | 0 | UM |
| /source/org/jfree/chart/axis/LogAxis.java | 1 | 2 | 934 | 66 | -- | 0 | UM |
| /source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java | 3 | 5 | 18 | 19 | -- | 0 | UM |