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 | 13 | 9 | 181 | 219 | -- | 0 | SM |
/java/net/sf/jabref/Util.java | 4 | 1 | 60 | 40 | -- | 0 | SM |
/java/net/sf/jabref/BibtexDatabase.java | 3 | 1 | 26 | 41 | -- | 0 | SM |
/java/net/sf/jabref/export/ExportFormats.java | 2 | 1 | 89 | 85 | -- | 0 | SM |
/java/net/sf/jabref/JabRefFrame.java | 2 | 1 | 24 | 96 | -- | 0 | SM |
/java/net/sf/jabref/external/AccessLinksForEntries.java | 2 | 0 | 19 | 0 | -- | 0 | SM |
/java/net/sf/jabref/imports/ParserResult.java | 2 | 0 | 7 | 0 | -- | 0 | SM |
/java/net/sf/jabref/imports/IEEEXploreFetcher.java | 1 | 0 | 8 | 0 | -- | 0 | SM |
/java/net/sf/jabref/GUIGlobals.java | 1 | 0 | 7 | 0 | -- | 0 | SM |
/java/net/sf/jabref/external/FileLinksUpgradeWarning.java | 1 | 0 | 6 | 0 | -- | 0 | SM |
/java/net/sf/jabref/gui/ImportInspectionDialog.java | 1 | 0 | 3 | 0 | -- | 0 | SM |
/java/net/sf/jabref/export/layout/LayoutHelper.java | 1 | 0 | 1 | 0 | -- | 0 | SM |
/java/net/sf/jabref/Globals.java | 2 | 2 | 4 | 4 | -- | 0 | SM |
/java/net/sf/jabref/imports/ImportFormatReader.java | 1 | 1 | 20 | 20 | -- | 0 | SM |
/java/net/sf/jabref/imports/AppendDatabaseAction.java | 1 | 1 | 7 | 7 | -- | 0 | SM |
/java/net/sf/jabref/wizard/integrity/IntegrityCheck.java | 1 | 1 | 5 | 5 | -- | 0 | SM |
/java/net/sf/jabref/gui/MainTableSelectionListener.java | 1 | 1 | 3 | 3 | -- | 0 | SM |
/java/net/sf/jabref/FieldComparator.java | 0 | 1 | 0 | 44 | -- | 0 | UM |
/java/net/sf/jabref/export/layout/Layout.java | 0 | 1 | 0 | 76 | -- | 0 | UM |
/java/net/sf/jabref/JabRef.java | 0 | 1 | 0 | 161 | -- | 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/export/ExportFormat.java | 1 | 2 | 108 | 71 | -- | 0 | UM |
/java/net/sf/jabref/export/layout/LayoutEntry.java | 2 | 2 | 15 | 32 | -- | 0 | UM |
/java/net/sf/jabref/util/XMPUtil.java | 5 | 5 | 24 | 405 | -- | 0 | UM |