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.
CCLSCCM
FileUMSMUMSMUMSM
/java/net/sf/jabref/imports/IEEEXploreFetcher.java156335419--0SM
/java/tests/net/sf/jabref/util/XMPUtilTest.java119169217--0SM
/java/net/sf/jabref/Util.java117142106--0SM
/java/net/sf/jabref/gui/ImportInspectionDialog.java87185158--1SM
/java/net/sf/jabref/GeneralTab.java757967--1SM
/java/net/sf/jabref/util/XMPUtil.java6530405--0SM
/java/net/sf/jabref/gui/FileListEditor.java63249237--0SM
/java/net/sf/jabref/gui/FileListEntryEditor.java8156178--0SM
/java/net/sf/jabref/BibtexDatabase.java727353--1SM
/java/net/sf/jabref/external/SynchronizeFileField.java4313137--0SM
/java/net/sf/jabref/gui/FileListTableModel.java4251122--0SM
/java/net/sf/jabref/JabRefPreferences.java427331--0SM
/java/net/sf/jabref/Globals.java42624--0SM
/java/net/sf/jabref/JabRefFrame.java3257102--1SM
/java/net/sf/jabref/external/WriteXMPAction.java416338--0SM
/java/net/sf/jabref/external/AccessLinksForEntries.java3110767--0SM
/java/net/sf/jabref/BasePanel.java31364--0SM
/java/net/sf/jabref/export/ExportFormats.java21116112--0SM
/java/net/sf/jabref/FieldComparator.java215368--0SM
/java/net/sf/jabref/external/ExternalFileTypeEntryEditor.java214438--0SM
/java/net/sf/jabref/external/FileLinksUpgradeWarning.java213030--0SM
/java/net/sf/jabref/GUIGlobals.java21126--0SM
/java/net/sf/jabref/EntryEditor.java2192--0SM
/java/net/sf/jabref/imports/ParserResult.java2070--0SM
/java/net/sf/jabref/FileTab.java102380--0SM
/java/net/sf/jabref/export/layout/AbstractParamLayoutFormatter.java10750--0SM
/java/net/sf/jabref/export/layout/format/WrapContent.java10420--0SM
/java/net/sf/jabref/export/layout/format/Replace.java10360--0SM
/java/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviator.java10290--0SM
/java/net/sf/jabref/PreviewPanel.java1030--0SM
/java/tests/net/sf/jabref/imports/OAI2ImportTest.java1020--0SM
/java/net/sf/jabref/export/layout/LayoutHelper.java1020--0SM
/java/net/sf/jabref/export/layout/format/HTMLChars.java441616--0SM
/java/net/sf/jabref/export/ExportFormat.java2211869--0SM
/java/net/sf/jabref/gui/MainTableSelectionListener.java221414--0SM
/java/net/sf/jabref/export/SaveDatabaseAction.java1140872--0SM
/java/net/sf/jabref/external/IconSelection.java11245159--0SM
/java/net/sf/jabref/external/WriteXMPEntryEditorAction.java1119064--0SM
/java/net/sf/jabref/export/layout/format/FileLink.java1110978--0SM
/java/net/sf/jabref/imports/MedlineFetcher.java119720--0SM
/java/net/sf/jabref/imports/ImportFormatReader.java112020--0SM
/java/net/sf/jabref/util/XMPSchemaBibtex.java111313--0SM
/java/net/sf/jabref/export/FileActions.java11175--0SM
/java/net/sf/jabref/imports/OpenDatabaseAction.java111010--0SM
/java/net/sf/jabref/imports/AppendDatabaseAction.java1199--0SM
/java/net/sf/jabref/imports/EndnoteImporter.java1144--0SM
/java/net/sf/jabref/PrefsDialog3.java1144--0SM
/java/net/sf/jabref/export/ModsExportFormat.java01023--0UM
/java/net/sf/jabref/export/layout/Layout.java01076--0UM
/java/net/sf/jabref/wizard/integrity/IntegrityCheck.java1103--0UM
/java/net/sf/jabref/external/PushToWinEdt.java11620--0UM
/java/net/sf/jabref/imports/OAI2Fetcher.java11233--0UM
/java/net/sf/jabref/gui/MainTableFormat.java11838--0UM
/java/net/sf/jabref/imports/ImportMenuItem.java112154--0UM
/java/net/sf/jabref/ExternalTab.java113260--0UM
/java/net/sf/jabref/export/layout/LayoutEntry.java221336--0UM
/java/net/sf/jabref/BibtexEntry.java222032--0UM
/java/net/sf/jabref/EntryComparator.java222466--0UM
/java/net/sf/jabref/external/DroppedFileHandler.java2240184--0UM
/java/net/sf/jabref/JabRef.java2335224--0UM
/java/net/sf/jabref/labelPattern/LabelPatternUtil.java88125194--0UM