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/JabRef.java | 3 | 2 | 36 | 86 | -- | 0 | SM |
/java/net/sf/jabref/PreviewPanel.java | 1 | 0 | 3 | 0 | -- | 0 | SM |
/java/net/sf/jabref/imports/ScifinderImporter.java | 3 | 3 | 22 | 22 | -- | 0 | SM |
/java/net/sf/jabref/JabRefPreferences.java | 1 | 1 | 10 | 10 | -- | 0 | SM |
/java/net/sf/jabref/net/URLDownload.java | 0 | 1 | 0 | 8 | -- | 0 | UM |
/java/net/sf/jabref/net/CookieHandlerImpl.java | 1 | 2 | 110 | 94 | -- | 0 | UM |
/java/net/sf/jabref/imports/OpenDatabaseAction.java | 3 | 3 | 42 | 65 | -- | 0 | UM |