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/BasePanel.java | 6 | 2 | 120 | 43 | -- | 0 | SM |
/java/net/sf/jabref/export/CustomExportList.java | 4 | 3 | 25 | 21 | -- | 0 | SM |
/java/net/sf/jabref/external/DownloadExternalFile.java | 4 | 2 | 55 | 127 | -- | 0 | SM |
/java/net/sf/jabref/groups/GroupDialog.java | 3 | 1 | 9 | 1 | -- | 0 | SM |
/java/net/sf/jabref/JabRefFrame.java | 2 | 1 | 10 | 4 | -- | 1 | SM |
/java/net/sf/jabref/export/layout/format/FormatChars.java | 1 | 0 | 658 | 0 | -- | 0 | SM |
/java/net/sf/jabref/imports/RisImporter.java | 2 | 2 | 8 | 8 | -- | 0 | SM |
/java/net/sf/jabref/ExternalTab.java | 1 | 1 | 45 | 45 | -- | 0 | SM |
/java/net/sf/jabref/JabRefPreferences.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
/java/net/sf/jabref/external/ExternalFileMenuItem.java | 1 | 1 | 1 | 1 | -- | 0 | SM |
/java/net/sf/jabref/EntryEditor.java | 1 | 1 | 0 | 0 | -- | 0 | SM |
/java/net/sf/jabref/external/RegExpFileSearch.java | 1 | 2 | 318 | 38 | -- | 0 | UM |