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/tests/net/sf/jabref/util/XMPUtilTest.java | 11 | 9 | 169 | 217 | -- | 0 | SM |
| /java/net/sf/jabref/labelPattern/LabelPatternUtil.java | 7 | 6 | 104 | 162 | -- | 0 | SM |
| /java/net/sf/jabref/Util.java | 6 | 4 | 114 | 89 | -- | 0 | SM |
| /java/net/sf/jabref/Globals.java | 5 | 3 | 37 | 6 | -- | 1 | SM |
| /java/net/sf/jabref/gui/FileListEntryEditor.java | 5 | 1 | 37 | 83 | -- | 0 | SM |
| /java/net/sf/jabref/imports/IEEEXploreFetcher.java | 4 | 1 | 238 | 28 | -- | 0 | SM |
| /java/net/sf/jabref/GeneralTab.java | 3 | 2 | 13 | 5 | -- | 1 | SM |
| /java/net/sf/jabref/BibtexDatabase.java | 3 | 1 | 26 | 41 | -- | 0 | SM |
| /java/net/sf/jabref/export/ExportFormats.java | 2 | 1 | 114 | 110 | -- | 0 | SM |
| /java/net/sf/jabref/JabRefFrame.java | 2 | 1 | 51 | 96 | -- | 1 | SM |
| /java/net/sf/jabref/external/ExternalFileTypeEntryEditor.java | 2 | 1 | 42 | 38 | -- | 0 | SM |
| /java/net/sf/jabref/gui/FileListEditor.java | 2 | 1 | 17 | 61 | -- | 0 | SM |
| /java/net/sf/jabref/external/FileLinksUpgradeWarning.java | 2 | 1 | 30 | 30 | -- | 0 | SM |
| /java/net/sf/jabref/gui/FileListTableModel.java | 2 | 1 | 5 | 35 | -- | 0 | SM |
| /java/net/sf/jabref/EntryEditor.java | 2 | 1 | 13 | 3 | -- | 0 | SM |
| /java/net/sf/jabref/external/AccessLinksForEntries.java | 2 | 0 | 18 | 0 | -- | 0 | SM |
| /java/net/sf/jabref/imports/ParserResult.java | 2 | 0 | 7 | 0 | -- | 0 | SM |
| /java/net/sf/jabref/external/WriteXMPAction.java | 1 | 0 | 17 | 0 | -- | 0 | SM |
| /java/net/sf/jabref/export/layout/ParamLayoutFormatter.java | 1 | 0 | 10 | 0 | -- | 0 | SM |
| /java/net/sf/jabref/gui/ImportInspectionDialog.java | 1 | 0 | 4 | 0 | -- | 0 | SM |
| /java/net/sf/jabref/PreviewPanel.java | 1 | 0 | 3 | 0 | -- | 0 | SM |
| /java/tests/net/sf/jabref/imports/OAI2ImportTest.java | 1 | 0 | 2 | 0 | -- | 0 | SM |
| /java/net/sf/jabref/export/layout/LayoutHelper.java | 1 | 0 | 2 | 0 | -- | 0 | SM |
| /java/net/sf/jabref/export/ExportFormat.java | 2 | 2 | 118 | 69 | -- | 0 | SM |
| /java/net/sf/jabref/gui/MainTableSelectionListener.java | 2 | 2 | 14 | 14 | -- | 0 | SM |
| /java/net/sf/jabref/external/IconSelection.java | 1 | 1 | 245 | 159 | -- | 0 | SM |
| /java/net/sf/jabref/export/layout/format/FileLink.java | 1 | 1 | 101 | 71 | -- | 0 | SM |
| /java/net/sf/jabref/imports/ImportFormatReader.java | 1 | 1 | 20 | 20 | -- | 0 | SM |
| /java/net/sf/jabref/external/ExternalFileType.java | 1 | 1 | 22 | 13 | -- | 0 | SM |
| /java/net/sf/jabref/external/ExternalFileTypeEditor.java | 1 | 1 | 16 | 16 | -- | 0 | SM |
| /java/net/sf/jabref/util/XMPSchemaBibtex.java | 1 | 1 | 13 | 13 | -- | 0 | SM |
| /java/net/sf/jabref/BasePanel.java | 1 | 1 | 15 | 4 | -- | 0 | SM |
| /java/net/sf/jabref/imports/AppendDatabaseAction.java | 1 | 1 | 9 | 9 | -- | 0 | SM |
| /java/net/sf/jabref/GUIGlobals.java | 1 | 1 | 10 | 6 | -- | 0 | SM |
| /java/net/sf/jabref/imports/EndnoteImporter.java | 1 | 1 | 4 | 4 | -- | 0 | SM |
| /java/net/sf/jabref/external/SynchronizeFileField.java | 1 | 1 | 3 | 3 | -- | 0 | SM |
| /java/net/sf/jabref/JabRefPreferences.java | 1 | 1 | 2 | 2 | -- | 0 | SM |
| /java/net/sf/jabref/groups/EntryTableTransferHandler.java | 0 | 1 | 0 | 17 | -- | 0 | UM |
| /java/net/sf/jabref/export/ModsExportFormat.java | 0 | 1 | 0 | 23 | -- | 0 | UM |
| /java/net/sf/jabref/gui/MainTableFormat.java | 0 | 1 | 0 | 38 | -- | 0 | UM |
| /java/net/sf/jabref/external/DroppedFileHandler.java | 0 | 1 | 0 | 63 | -- | 0 | UM |
| /java/net/sf/jabref/FieldComparator.java | 0 | 1 | 0 | 68 | -- | 0 | UM |
| /java/net/sf/jabref/export/layout/Layout.java | 0 | 1 | 0 | 76 | -- | 0 | UM |
| /java/net/sf/jabref/ExternalTab.java | 0 | 1 | 0 | 258 | -- | 0 | UM |
| /java/net/sf/jabref/wizard/integrity/IntegrityCheck.java | 1 | 1 | 0 | 3 | -- | 0 | UM |
| /java/net/sf/jabref/BibtexEntry.java | 1 | 1 | 2 | 14 | -- | 0 | UM |
| /java/net/sf/jabref/imports/ImportMenuItem.java | 1 | 1 | 21 | 54 | -- | 0 | UM |
| /java/net/sf/jabref/EntryComparator.java | 1 | 2 | 4 | 66 | -- | 0 | UM |
| /java/net/sf/jabref/JabRef.java | 1 | 2 | 5 | 166 | -- | 0 | UM |
| /java/net/sf/jabref/export/layout/LayoutEntry.java | 3 | 3 | 20 | 87 | -- | 0 | UM |
| /java/net/sf/jabref/util/XMPUtil.java | 5 | 5 | 24 | 405 | -- | 0 | UM |