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
/core/com/lowagie/text/Font.java107380--1SM
/core/com/lowagie/text/html/simpleparser/FactoryProperties.java106090--1SM
/toolbox/com/lowagie/toolbox/plugins/Normalize.java105860--0SM
/core/com/lowagie/text/pdf/PdfAction.java105640--0SM
/toolbox/com/lowagie/toolbox/plugins/HtmlBookmarks.java103660--0SM
/core/com/lowagie/text/Paragraph.java103570--0SM
/toolbox/com/lowagie/toolbox/plugins/Add3D.java103560--0SM
/core/com/lowagie/text/pdf/codec/TIFFField.java103560--1SM
/toolbox/com/lowagie/toolbox/plugins/ImageXRefViewer.java103200--0SM
/core/com/lowagie/text/html/HtmlTagMap.java103100--0SM
/toolbox/com/lowagie/toolbox/plugins/PhotoAlbum.java103060--0SM
/core/com/lowagie/text/xml/XmlParser.java103020--0SM
/toolbox/com/lowagie/toolbox/plugins/Handouts.java102700--0SM
/toolbox/com/lowagie/toolbox/plugins/Watermarker.java102620--0SM
/toolbox/com/lowagie/toolbox/plugins/Tiff2Pdf.java102520--0SM
/toolbox/com/lowagie/toolbox/plugins/ExtractAttachments.java102500--0SM
/core/com/lowagie/text/Utilities.java102420--0SM
/toolbox/com/lowagie/toolbox/plugins/Split.java102200--0SM
/toolbox/com/lowagie/toolbox/plugins/DvdCover.java102200--0SM
/toolbox/com/lowagie/toolbox/plugins/Encrypt.java102180--0SM
/toolbox/com/lowagie/toolbox/plugins/NUp.java102160--0SM
/toolbox/com/lowagie/toolbox/plugins/RemoveLaunchApplication.java102080--0SM
/toolbox/com/lowagie/toolbox/plugins/ConcatN.java102080--0SM
/toolbox/com/lowagie/toolbox/plugins/ReversePages.java102000--0SM
/toolbox/com/lowagie/toolbox/plugins/Divide.java101900--0SM
/toolbox/com/lowagie/toolbox/plugins/Concat.java101900--0SM
/toolbox/com/lowagie/toolbox/plugins/KnitTiff.java101880--0SM
/core/com/lowagie/text/pdf/PdfContentParser.java101880--0SM
/toolbox/com/lowagie/toolbox/plugins/InspectPDF.java101780--0SM
/toolbox/com/lowagie/toolbox/plugins/Txt2Pdf.java101720--0SM
/toolbox/com/lowagie/toolbox/plugins/Burst.java101680--0SM
/core/com/lowagie/text/xml/TagMap.java101660--1SM
/toolbox/com/lowagie/toolbox/plugins/SelectedPages.java101560--0SM
/core/com/lowagie/text/pdf/PdfEncryptor.java101560--0SM
/toolbox/com/lowagie/toolbox/plugins/CompressDecompressPageContent.java101520--0SM
/toolbox/com/lowagie/toolbox/plugins/XML2Bookmarks.java101440--0SM
/core/com/lowagie/text/pdf/PdfFont.java101410--1SM
/core/com/lowagie/text/pdf/PdfCopyForms.java101350--0SM
/core/com/lowagie/text/pdf/PdfCopyFields.java101350--0SM
/toolbox/com/lowagie/toolbox/plugins/Decrypt.java101280--0SM
/toolbox/com/lowagie/toolbox/plugins/Bookmarks2XML.java101280--0SM
/core/com/lowagie/text/pdf/PdfPage.java10840--0SM
/core/com/lowagie/text/xml/simpleparser/SimpleXMLDocHandler.java10180--0SM
/core/com/lowagie/text/pdf/hyphenation/PatternConsumer.java10140--0SM
/core/com/lowagie/text/html/simpleparser/Img.java10140--0SM
/core/com/lowagie/text/html/simpleparser/ImageProvider.java10140--0SM
/core/com/lowagie/text/pdf/parser/ContentOperator.java10130--0SM
/core/com/lowagie/text/TextElementArray.java1090--0SM
/rtf/com/lowagie/text/rtf/parser/ctrlwords/RtfCtrlWordMap.java11361636--1SM
/core/com/lowagie/text/pdf/BarcodePDF417.java11262210--1SM
/core/com/lowagie/text/pdf/codec/wmf/MetaDo.java111364846--0SM
/core/com/lowagie/text/pdf/BarcodeDatamatrix.java11189426--1SM
/core/com/lowagie/text/Image.java11189024--0SM
/core/com/lowagie/text/pdf/codec/BmpImage.java11185024--1SM
/core/com/lowagie/text/pdf/CFFFont.java111541314--0SM
/core/com/lowagie/text/pdf/PdfName.java11152114--2SM
/core/com/lowagie/text/factories/ElementFactory.java11932144--0SM
/rtf/com/lowagie/text/rtf/parser/destinations/RtfDestinationDocument.java1183060--2SM
/core/com/lowagie/text/pdf/PdfEncryption.java1184628--0SM
/rtf/com/lowagie/text/rtf/style/RtfFont.java1170368--1SM
/core/com/lowagie/text/pdf/PdfAcroForm.java1170241--1SM
/core/com/lowagie/text/xml/simpleparser/EntitiesToUnicode.java1164446--1SM
/core/com/lowagie/text/Rectangle.java116606--0SM
/core/com/lowagie/text/xml/simpleparser/EntitiesToSymbol.java1160814--1SM
/core/com/lowagie/text/pdf/SequenceList.java11474120--0SM
/core/com/lowagie/text/html/WebColors.java1138482--0SM
/core/com/lowagie/text/xml/xmp/XmpWriter.java11332102--0SM
/rtf/com/lowagie/text/rtf/RtfMapper.java11246168--0SM
/core/com/lowagie/text/xml/simpleparser/IanaEncodings.java1138014--1SM
/rtf/com/lowagie/text/rtf/document/RtfDocument.java1135818--1SM
/core/com/lowagie/text/pdf/FontDetails.java1132742--1SM
/core/com/lowagie/text/DocWriter.java1131322--0SM
/core/com/lowagie/tools/Executable.java1126252--0SM
/core/com/lowagie/text/pdf/hyphenation/Hyphenator.java1124840--1SM
/core/com/lowagie/text/Row.java112806--0SM
/rups/com/lowagie/rups/view/itext/PagesTable.java1120975--0SM
/core/com/lowagie/text/pdf/parser/PdfContentReaderTool.java1122657--0SM
/core/com/lowagie/text/pdf/FontSelector.java11154118--1SM
/core/com/lowagie/text/pdf/TSAClientBouncyCastle.java1118862--0SM
/rups/com/lowagie/rups/view/itext/treenodes/XdpTreeNode.java1117757--0SM
/core/com/lowagie/text/pdf/MappedRandomAccessFile.java1119040--0SM
/core/com/lowagie/text/pdf/PdfAppearance.java1118042--1SM
/core/com/lowagie/tools/ConcatPdf.java1111996--0SM
/core/com/lowagie/text/pdf/OcspClientBouncyCastle.java1118324--0SM
/core/com/lowagie/text/pdf/events/FieldPositioningEvents.java1116442--1SM
/core/com/lowagie/text/MarkedSection.java1117826--0SM
/core/com/lowagie/text/pdf/PdfNumberTree.java1118412--0SM
/core/com/lowagie/text/pdf/PdfNameTree.java1118412--0SM
/core/com/lowagie/text/pdf/EnumerateTTC.java1111272--0SM
/core/com/lowagie/tools/EncryptPdf.java1112852--0SM
/core/com/lowagie/text/Meta.java111586--0SM
/core/com/lowagie/text/pdf/hyphenation/CharVector.java1115210--0SM
/core/com/lowagie/text/html/simpleparser/IncCell.java111526--1SM
/core/com/lowagie/text/xml/xmp/XmpSchema.java1113414--0SM
/rtf/com/lowagie/text/rtf/style/RtfFontList.java1111036--1SM
/rups/com/lowagie/rups/view/itext/treenodes/XfaTreeNode.java118947--0SM
/core/com/lowagie/text/pdf/draw/VerticalPositionMark.java1111010--0SM
/core/com/lowagie/text/Element.java111142--0SM
/rtf/com/lowagie/text/rtf/style/RtfColorList.java118822--1SM
/rtf/com/lowagie/text/rtf/parser/ctrlwords/RtfCtrlWordData.java11988--0SM
/core/com/lowagie/text/pdf/PdfTextArray.java11986--1SM
/rups/com/lowagie/rups/view/models/DictionaryTableModel.java118410--0SM
/rtf/com/lowagie/text/rtf/text/RtfChapter.java115632--0SM
/core/com/lowagie/text/xml/xmp/XmpArray.java115530--0SM
/core/com/lowagie/text/xml/xmp/LangAlt.java116618--0SM
/core/com/lowagie/text/MarkedObject.java11786--0SM
/core/com/lowagie/text/pdf/PdfLayerMembership.java11706--1SM
/core/com/lowagie/text/pdf/PdfCopyFormsImp.java116412--0SM
/core/com/lowagie/tools/ToolboxAvailable.java114430--0SM
/core/com/lowagie/text/pdf/events/PdfPCellEventForwarder.java113813--1SM
/core/com/lowagie/text/pdf/events/PdfPTableEventForwarder.java113512--1SM
/core/com/lowagie/text/pdf/ByteBuffer.java0106--0UM
/core/com/lowagie/text/Chapter.java125224--0UM
/rtf/com/lowagie/text/rtf/text/RtfTabGroup.java125820--1UM
/rtf/com/lowagie/text/rtf/parser/RtfParserState.java127136--1UM
/rtf/com/lowagie/text/rtf/document/RtfInfoGroup.java127244--1UM
/core/com/lowagie/text/xml/SAXmyHandler.java127050--0UM
/core/com/lowagie/text/html/simpleparser/StyleSheet.java1210236--2UM
/core/com/lowagie/text/pdf/GlyphList.java1213412--2UM
/core/com/lowagie/text/pdf/CMapAwareDocumentFont.java1214333--0UM
/core/com/lowagie/text/pdf/PdfStructureTreeRoot.java1212651--1UM
/rtf/com/lowagie/text/rtf/list/RtfListTable.java1214882--2UM
/core/com/lowagie/text/FontFactory.java1222412--0UM
/core/com/lowagie/text/pdf/PdfLayer.java1224022--1UM
/rups/com/lowagie/rups/model/TreeNodeFactory.java1217999--0UM
/rtf/com/lowagie/text/rtf/text/RtfParagraph.java12184118--0UM
/core/com/lowagie/text/Anchor.java1221888--0UM
/core/com/lowagie/text/pdf/PageResources.java1225376--2UM
/rtf/com/lowagie/text/rtf/parser/destinations/RtfDestinationMgr.java12218112--2UM
/rups/com/lowagie/rups/view/itext/FormTree.java1228692--0UM
/core/com/lowagie/text/Annotation.java1237012--1UM
/rtf/com/lowagie/text/rtf/graphic/RtfShape.java12303186--1UM
/core/com/lowagie/text/pdf/PdfStamper.java1248012--1UM
/core/com/lowagie/text/html/SAXmyHtmlHandler.java12275224--0UM
/core/com/lowagie/text/pdf/IntHashtable.java1248028--1UM
/core/com/lowagie/text/pdf/hyphenation/SimplePatternParser.java12412106--1UM
/core/com/lowagie/text/pdf/Type3Font.java12374172--1UM
/rtf/com/lowagie/text/rtf/parser/destinations/RtfDestinationFontTable.java1254826--1UM
/core/com/lowagie/text/pdf/hyphenation/HyphenationTree.java12498148--1UM
/core/com/lowagie/text/SimpleTable.java12454274--1UM
/core/com/lowagie/text/pdf/TrueTypeFontUnicode.java12642173--1UM
/core/com/lowagie/text/pdf/codec/GifImage.java1281016--1UM
/core/com/lowagie/text/pdf/PdfPCell.java1281323--0UM
/core/com/lowagie/text/pdf/BaseField.java1278466--1UM
/core/com/lowagie/text/pdf/TextField.java1298040--1UM
/core/com/lowagie/text/pdf/CJKFont.java12986172--3UM
/core/com/lowagie/text/pdf/fonts/cmaps/CMapParser.java12791567--0UM
/core/com/lowagie/text/pdf/PdfChunk.java12993371--4UM
/core/com/lowagie/text/pdf/PdfSignatureAppearance.java121833148--1UM
/rtf/com/lowagie/text/rtf/style/RtfStylesheetList.java1313256--1UM
/rtf/com/lowagie/text/rtf/parser/ctrlwords/RtfCtrlWordMgr.java1315342--1UM
/core/com/lowagie/text/html/simpleparser/IncTable.java1314172--3UM
/core/com/lowagie/text/html/simpleparser/ChainedProperties.java1316154--2UM
/core/com/lowagie/text/pdf/fonts/cmaps/CMap.java1313682--3UM
/core/com/lowagie/text/pdf/PdfLister.java1317890--0UM
/rtf/com/lowagie/text/rtf/document/output/RtfByteArrayBuffer.java1332656--1UM
/core/com/lowagie/text/pdf/PdfSmartCopy.java13278112--1UM
/core/com/lowagie/text/pdf/PdfOutline.java1336744--1UM
/core/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java1336886--1UM
/core/com/lowagie/text/pdf/internal/PdfAnnotationsImp.java13320151--2UM
/core/com/lowagie/text/pdf/PdfPageLabels.java13320192--1UM
/core/com/lowagie/text/pdf/codec/wmf/MetaState.java13494152--2UM
/core/com/lowagie/text/SimpleCell.java13589146--1UM
/rtf/com/lowagie/text/rtf/parser/properties/RtfProperty.java1367494--2UM
/core/com/lowagie/text/xml/simpleparser/SimpleXMLParser.java13103634--2UM
/core/com/lowagie/text/pdf/PdfAnnotation.java13103968--2UM
/rtf/com/lowagie/text/rtf/parser/RtfParser.java131206156--2UM
/rtf/com/lowagie/text/rtf/parser/destinations/RtfDestinationColorTable.java1425044--1UM
/rtf/com/lowagie/text/rtf/list/RtfListItem.java14202136--0UM
/core/com/lowagie/text/pdf/FdfReader.java14236108--1UM
/core/com/lowagie/text/pdf/events/IndexEvents.java1430062--5UM
/core/com/lowagie/text/pdf/PdfReaderInstance.java14235157--3UM
/core/com/lowagie/text/pdf/DefaultFontMapper.java1434870--2UM
/core/com/lowagie/text/pdf/VerticalText.java14330108--1UM
/core/com/lowagie/text/pdf/PdfPages.java14254191--2UM
/core/com/lowagie/text/List.java1443274--1UM
/core/com/lowagie/text/Section.java1457794--1UM
/core/com/lowagie/text/pdf/parser/PdfContentStreamProcessor.java1460298--2UM
/core/com/lowagie/text/pdf/MultiColumnText.java14574166--1UM
/rtf/com/lowagie/text/rtf/table/RtfCell.java14748414--1UM
/core/com/lowagie/text/pdf/BaseFont.java141257132--3UM
/core/com/lowagie/text/pdf/BidiOrder.java141372142--0UM
/core/com/lowagie/text/pdf/PdfPRow.java141002718--0UM
/core/com/lowagie/text/xml/SAXiTextHandler.java141178896--2UM
/core/com/lowagie/text/pdf/CFFFontSubset.java141852367--10UM
/core/com/lowagie/text/html/HtmlWriter.java141546896--1UM
/rtf/com/lowagie/text/rtf/parser/RtfImportMappings.java157936--4UM
/rtf/com/lowagie/text/rtf/parser/RtfImportMgr.java1517872--4UM
/rtf/com/lowagie/text/rtf/text/RtfPhrase.java15166118--1UM
/rtf/com/lowagie/text/rtf/text/RtfSection.java15184150--1UM
/rtf/com/lowagie/text/rtf/table/RtfTable.java15254134--1UM
/core/com/lowagie/text/pdf/PdfDictionary.java1532070--1UM
/core/com/lowagie/text/pdf/PdfTable.java15260172--2UM
/core/com/lowagie/text/pdf/SimpleNamedDestination.java15450111--2UM
/core/com/lowagie/text/Chunk.java1554072--1UM
/core/com/lowagie/text/Phrase.java15555134--0UM
/core/com/lowagie/text/pdf/DocumentFont.java151005216--1UM
/core/com/lowagie/text/pdf/Type1Font.java151146452--2UM
/core/com/lowagie/text/html/simpleparser/HTMLWorker.java151257394--5UM
/core/com/lowagie/text/pdf/BidiLine.java151666458--1UM
/rtf/com/lowagie/text/rtf/table/RtfBorderGroup.java1617871--1UM
/core/com/lowagie/text/pdf/XfdfReader.java1622298--4UM
/core/com/lowagie/text/pdf/PdfFormField.java1649484--1UM
/core/com/lowagie/text/pdf/FdfWriter.java16446259--1UM
/core/com/lowagie/text/pdf/TrueTypeFontSubSet.java16653400--3UM
/core/com/lowagie/text/pdf/SimpleBookmark.java161106341--2UM
/core/com/lowagie/text/pdf/PRAcroForm.java17207143--3UM
/rtf/com/lowagie/text/rtf/table/RtfRow.java17418306--1UM
/core/com/lowagie/text/pdf/hyphenation/TernaryTree.java17806172--2UM
/core/com/lowagie/text/Cell.java17732292--1UM
/rtf/com/lowagie/text/rtf/list/RtfList.java17676390--2UM
/core/com/lowagie/text/pdf/codec/TIFFDirectory.java17772322--1UM
/core/com/lowagie/text/FontFactoryImp.java17788537--2UM
/core/com/lowagie/text/pdf/PdfCell.java17967493--2UM
/core/com/lowagie/text/pdf/PdfEncodings.java171263383--2UM
/core/com/lowagie/text/pdf/PdfGraphics2D.java172360471--2UM
/core/com/lowagie/text/pdf/ColumnText.java171976979--3UM
/core/com/lowagie/text/pdf/PdfContentByte.java173256492--3UM
/rtf/com/lowagie/text/rtf/parser/destinations/RtfDestination.java18191112--1UM
/core/com/lowagie/text/pdf/codec/JBIG2SegmentReader.java18595367--5UM
/core/com/lowagie/text/pdf/events/PdfPageEventForwarder.java111169142--1UM
/core/com/lowagie/text/pdf/PdfArray.java111328120--1UM
/core/com/lowagie/text/pdf/PdfCopy.java1111102494--3UM
/core/com/lowagie/text/pdf/PdfCopyFieldsImp.java1121102515--13UM
/core/com/lowagie/text/Table.java1121404678--1UM
/core/com/lowagie/text/pdf/PdfLine.java113498300--1UM
/core/com/lowagie/text/Document.java115635284--3UM
/core/com/lowagie/text/pdf/XfaForm.java1161340400--7UM
/core/com/lowagie/text/pdf/PdfPTable.java1161491520--1UM
/core/com/lowagie/text/pdf/PdfStamperImp.java11628341202--5UM
/core/com/lowagie/text/pdf/PdfDocument.java11741101479--8UM
/core/com/lowagie/text/pdf/TrueTypeFont.java11822371258--4UM
/core/com/lowagie/text/pdf/PdfPKCS7.java1192205972--7UM
/core/com/lowagie/text/pdf/PdfReader.java13154802289--5UM
/core/com/lowagie/text/pdf/AcroFields.java13335042195--14UM