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 |
---|
/net/sf/freecol/client/gui/panel/EuropePanel.java | 1 | 0 | 14 | 0 | -- | 0 | SM |
/net/sf/freecol/tools/InstallerTranslations.java | 1 | 1 | 322 | 128 | -- | 0 | SM |
/net/sf/freecol/client/gui/action/ZoomOutAction.java | 1 | 1 | 11 | 11 | -- | 0 | SM |
/net/sf/freecol/client/gui/panel/InfoPanel.java | 1 | 1 | 10 | 10 | -- | 0 | SM |
/net/sf/freecol/client/control/InGameController.java | 1 | 1 | 6 | 6 | -- | 0 | SM |