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 |
---|
/java/net/sf/jabref/external/DownloadExternalFile.java | 5 | 2 | 72 | 127 | -- | 0 | SM |
/java/net/sf/jabref/BasePanel.java | 5 | 1 | 122 | 3 | -- | 0 | SM |
/java/net/sf/jabref/JabRefFrame.java | 3 | 1 | 98 | 4 | -- | 1 | SM |
/java/net/sf/jabref/Globals.java | 2 | 0 | 123 | 0 | -- | 0 | SM |
/java/net/sf/jabref/net/URLDownload.java | 2 | 0 | 11 | 0 | -- | 0 | SM |
/java/net/sf/jabref/GUIGlobals.java | 1 | 0 | 4 | 0 | -- | 0 | SM |