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.java107420--1SM
/rtf/com/lowagie/text/rtf/style/RtfFont.java106940--0SM
/toolbox/com/lowagie/toolbox/plugins/Normalize.java106020--0SM
/core/com/lowagie/text/pdf/PdfAction.java105660--0SM
/toolbox/com/lowagie/toolbox/plugins/HtmlBookmarks.java103660--0SM
/toolbox/com/lowagie/toolbox/plugins/Add3D.java103560--0SM
/core/com/lowagie/text/pdf/codec/TIFFField.java103560--1SM
/core/com/lowagie/text/Paragraph.java103310--0SM
/toolbox/com/lowagie/toolbox/plugins/ImageXRefViewer.java103200--0SM
/toolbox/com/lowagie/toolbox/plugins/PhotoAlbum.java103100--0SM
/core/com/lowagie/text/xml/XmlParser.java103020--0SM
/toolbox/com/lowagie/toolbox/plugins/Handouts.java102700--0SM
/toolbox/com/lowagie/toolbox/plugins/ExtractAttachments.java102660--0SM
/toolbox/com/lowagie/toolbox/plugins/Watermarker.java102620--0SM
/toolbox/com/lowagie/toolbox/plugins/Tiff2Pdf.java102520--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
/core/com/lowagie/text/PageSize.java101540--52SM
/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/PdfCopyFields.java101330--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/TextElementArray.java1090--0SM
/rtf/com/lowagie/text/rtf/parser/ctrlwords/RtfCtrlWordMap.java11360830--1SM
/core/com/lowagie/text/pdf/codec/wmf/MetaDo.java111364846--0SM
/core/com/lowagie/text/pdf/BarcodeDatamatrix.java11189426--1SM
/core/com/lowagie/text/pdf/codec/PngImage.java111544348--0SM
/core/com/lowagie/text/pdf/codec/Base64.java11153674--0SM
/core/com/lowagie/text/pdf/Barcode128.java111258248--0SM
/core/com/lowagie/text/pdf/PushbuttonField.java11804464--0SM
/core/com/lowagie/text/factories/ElementFactory.java11896138--0SM
/rtf/com/lowagie/text/rtf/parser/destinations/RtfDestinationDocument.java1182860--2SM
/core/com/lowagie/text/pdf/PdfEncryption.java1180226--0SM
/core/com/lowagie/text/pdf/PdfAcroForm.java1170241--1SM
/core/com/lowagie/text/Jpeg.java11406290--0SM
/core/com/lowagie/text/xml/simpleparser/EntitiesToUnicode.java1164446--1SM
/core/com/lowagie/text/pdf/PdfPCell.java116646--0SM
/core/com/lowagie/text/Rectangle.java116506--0SM
/core/com/lowagie/text/xml/simpleparser/EntitiesToSymbol.java1160814--1SM
/core/com/lowagie/text/pdf/SequenceList.java11474120--0SM
/core/com/lowagie/text/pdf/internal/PdfViewerPreferencesImp.java1147664--0SM
/core/com/lowagie/text/pdf/PdfStream.java11372144--0SM
/core/com/lowagie/text/html/Markup.java1140088--0SM
/core/com/lowagie/text/pdf/PdfStamper.java114606--1SM
/core/com/lowagie/text/html/WebColors.java1138482--0SM
/rtf/com/lowagie/text/rtf/parser/ctrlwords/RtfCtrlWordHandler.java11280152--0SM
/core/com/lowagie/text/xml/xmp/XmpWriter.java11326102--0SM
/toolbox/com/lowagie/toolbox/Versions.java11280128--0SM
/core/com/lowagie/text/xml/simpleparser/IanaEncodings.java1138014--1SM
/rtf/com/lowagie/text/rtf/document/RtfDocument.java1134418--1SM
/rtf/com/lowagie/text/rtf/RtfMapper.java11215141--0SM
/core/com/lowagie/text/DocWriter.java1130722--0SM
/core/com/lowagie/tools/Executable.java1126252--0SM
/core/com/lowagie/text/pdf/hyphenation/Hyphenator.java1124840--1SM
/core/com/lowagie/text/Row.java112806--0SM
/toolbox/com/lowagie/toolbox/swing/PdfInformationPanel.java1118896--0SM
/rups/com/lowagie/rups/view/itext/PagesTable.java1120975--0SM
/rtf/com/lowagie/text/rtf/document/RtfProtection.java1118896--0SM
/rtf/com/lowagie/text/rtf/RtfWriter2.java1123828--0SM
/core/com/lowagie/text/Utilities.java1121148--0SM
/rups/com/lowagie/rups/view/itext/treenodes/XdpTreeNode.java1117757--0SM
/core/com/lowagie/text/pdf/FontSelector.java1113499--1SM
/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/events/FieldPositioningEvents.java1116442--1SM
/core/com/lowagie/text/MarkedSection.java1117826--0SM
/core/com/lowagie/text/pdf/PdfNumberTree.java1119012--0SM
/core/com/lowagie/text/pdf/PdfNameTree.java1119012--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.java1113214--0SM
/rtf/com/lowagie/text/rtf/style/RtfFontList.java1110836--1SM
/rups/com/lowagie/rups/view/itext/treenodes/XfaTreeNode.java118947--0SM
/core/com/lowagie/text/Element.java111112--0SM
/rtf/com/lowagie/text/rtf/style/RtfColorList.java118622--1SM
/rtf/com/lowagie/text/rtf/parser/ctrlwords/RtfCtrlWordData.java11988--0SM
/rups/com/lowagie/rups/view/models/DictionaryTableModel.java118410--0SM
/rtf/com/lowagie/text/rtf/text/RtfChapter.java115432--0SM
/core/com/lowagie/text/xml/xmp/XmpArray.java115530--0SM
/core/com/lowagie/text/xml/xmp/LangAlt.java116618--0SM
/core/com/lowagie/text/pdf/CMYKColor.java11786--0SM
/core/com/lowagie/text/MarkedObject.java11786--0SM
/core/com/lowagie/text/pdf/PdfLayerMembership.java11706--1SM
/core/com/lowagie/tools/ToolboxAvailable.java114430--0SM
/core/com/lowagie/text/pdf/SpotColor.java115816--0SM
/core/com/lowagie/text/pdf/GrayColor.java11466--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.java127044--1UM
/core/com/lowagie/text/xml/SAXmyHandler.java127050--0UM
/core/com/lowagie/text/html/simpleparser/StyleSheet.java1210036--2UM
/core/com/lowagie/text/pdf/collection/PdfCollectionSort.java129050--0UM
/core/com/lowagie/text/pdf/internal/PolylineShapeIterator.java129248--0UM
/core/com/lowagie/text/pdf/GlyphList.java1213412--2UM
/core/com/lowagie/text/FontFactory.java1222112--0UM
/rtf/com/lowagie/text/rtf/list/RtfListTable.java1216290--2UM
/core/com/lowagie/text/pdf/PdfLayer.java1223722--1UM
/rups/com/lowagie/rups/model/TreeNodeFactory.java1217999--0UM
/rtf/com/lowagie/text/rtf/text/RtfParagraph.java12183119--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
/core/com/lowagie/text/pdf/FontDetails.java12318179--1UM
/rtf/com/lowagie/text/rtf/graphic/RtfShape.java12305192--1UM
/core/com/lowagie/text/html/SAXmyHtmlHandler.java12275224--0UM
/core/com/lowagie/text/pdf/IntHashtable.java1248028--1UM
/core/com/lowagie/text/pdf/hyphenation/SimplePatternParser.java12410106--1UM
/core/com/lowagie/text/pdf/Type3Font.java12368172--1UM
/core/com/lowagie/text/html/simpleparser/FactoryProperties.java1246990--1UM
/rtf/com/lowagie/text/rtf/parser/destinations/RtfDestinationFontTable.java1254626--1UM
/core/com/lowagie/text/pdf/hyphenation/HyphenationTree.java12498148--1UM
/core/com/lowagie/text/SimpleTable.java12466274--1UM
/core/com/lowagie/text/pdf/BaseField.java1278466--1UM
/core/com/lowagie/text/pdf/codec/CCITTG4Encoder.java12948116--0UM
/core/com/lowagie/text/pdf/CJKFont.java12978172--3UM
/core/com/lowagie/text/pdf/PdfName.java12123098--1UM
/core/com/lowagie/text/pdf/PdfPRow.java121050556--0UM
/core/com/lowagie/text/pdf/CFFFont.java121541474--0UM
/core/com/lowagie/text/pdf/codec/TIFFFaxDecoder.java121862456--0UM
/core/com/lowagie/text/pdf/collection/PdfCollectionItem.java1312642--0UM
/core/com/lowagie/text/pdf/PdfStructureTreeRoot.java1312669--1UM
/rtf/com/lowagie/text/rtf/parser/ctrlwords/RtfCtrlWordMgr.java1315342--1UM
/rtf/com/lowagie/text/rtf/style/RtfStylesheetList.java1313864--1UM
/core/com/lowagie/text/html/simpleparser/IncTable.java1314172--3UM
/core/com/lowagie/text/html/simpleparser/ChainedProperties.java1316054--1UM
/core/com/lowagie/text/pdf/collection/PdfCollectionField.java13160104--0UM
/core/com/lowagie/text/pdf/PdfLister.java1317689--0UM
/rtf/com/lowagie/text/rtf/document/output/RtfByteArrayBuffer.java1332656--1UM
/core/com/lowagie/text/pdf/PdfSmartCopy.java13282104--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
/rtf/com/lowagie/text/rtf/table/RtfCell.java13494190--1UM
/core/com/lowagie/text/pdf/BarcodeCodabar.java13426262--0UM
/core/com/lowagie/text/SimpleCell.java13599146--1UM
/rtf/com/lowagie/text/rtf/parser/properties/RtfProperty.java1367494--2UM
/rtf/com/lowagie/text/rtf/list/RtfList.java13739165--1UM
/core/com/lowagie/text/pdf/TextField.java1398264--1UM
/core/com/lowagie/text/xml/simpleparser/SimpleXMLParser.java13101234--2UM
/core/com/lowagie/text/pdf/PdfAnnotation.java13100168--2UM
/core/com/lowagie/text/pdf/codec/GifImage.java13810266--1UM
/core/com/lowagie/text/pdf/Type1Font.java131144364--2UM
/core/com/lowagie/text/Image.java13175486--0UM
/core/com/lowagie/text/pdf/PdfSignatureAppearance.java131839242--1UM
/core/com/lowagie/text/pdf/BarcodePDF417.java13262284--1UM
/rtf/com/lowagie/text/rtf/list/RtfListItem.java14154110--0UM
/rtf/com/lowagie/text/rtf/table/RtfTable.java1420092--1UM
/rtf/com/lowagie/text/rtf/parser/destinations/RtfDestinationColorTable.java1425044--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/PdfPages.java14250188--2UM
/core/com/lowagie/text/pdf/VerticalText.java14330108--1UM
/core/com/lowagie/text/List.java1443274--1UM
/rtf/com/lowagie/text/rtf/headerfooter/RtfHeaderFooter.java14374172--0UM
/core/com/lowagie/text/Section.java1457794--1UM
/core/com/lowagie/text/pdf/MultiColumnText.java14564168--1UM
/core/com/lowagie/text/pdf/PdfChunk.java14962496--4UM
/core/com/lowagie/text/pdf/BidiOrder.java141372142--0UM
/core/com/lowagie/text/pdf/codec/BmpImage.java141850174--1UM
/core/com/lowagie/text/xml/SAXiTextHandler.java141161880--2UM
/core/com/lowagie/text/pdf/CFFFontSubset.java141828367--10UM
/core/com/lowagie/text/html/HtmlWriter.java141546896--1UM
/rtf/com/lowagie/text/rtf/parser/RtfImportMappings.java157936--4UM
/core/com/lowagie/text/pdf/PdfTextArray.java157455--1UM
/core/com/lowagie/text/pdf/XfdfReader.java1519074--3UM
/rtf/com/lowagie/text/rtf/text/RtfPhrase.java15161115--1UM
/rtf/com/lowagie/text/rtf/parser/RtfImportMgr.java1521272--4UM
/rtf/com/lowagie/text/rtf/text/RtfSection.java15182148--1UM
/core/com/lowagie/text/pdf/PdfDictionary.java1532072--1UM
/core/com/lowagie/text/pdf/FdfReader.java15240156--1UM
/core/com/lowagie/text/pdf/PdfTable.java15260172--2UM
/core/com/lowagie/text/Chunk.java1551773--1UM
/core/com/lowagie/text/pdf/TrueTypeFontUnicode.java15663328--1UM
/rtf/com/lowagie/text/rtf/table/RtfBorderGroup.java1617871--1UM
/core/com/lowagie/text/pdf/PdfFormField.java1649484--1UM
/core/com/lowagie/text/pdf/SimpleNamedDestination.java16452147--2UM
/rtf/com/lowagie/text/rtf/table/RtfRow.java16360266--1UM
/core/com/lowagie/text/pdf/FdfWriter.java16426251--1UM
/rtf/com/lowagie/text/rtf/parser/RtfParser.java161156370--2UM
/core/com/lowagie/text/html/simpleparser/HTMLWorker.java161132479--5UM
/core/com/lowagie/text/html/HtmlTagMap.java1730842--0UM
/core/com/lowagie/text/pdf/PRAcroForm.java17207143--3UM
/core/com/lowagie/text/Cell.java17732292--1UM
/core/com/lowagie/text/pdf/TrueTypeFontSubSet.java17653430--3UM
/core/com/lowagie/text/pdf/codec/TIFFDirectory.java17772322--1UM
/core/com/lowagie/text/pdf/PdfCell.java17965491--2UM
/core/com/lowagie/text/pdf/SimpleBookmark.java171102363--2UM
/core/com/lowagie/text/pdf/DocumentFont.java17996540--1UM
/rtf/com/lowagie/text/rtf/parser/destinations/RtfDestination.java18191112--1UM
/core/com/lowagie/text/pdf/hyphenation/TernaryTree.java18806204--2UM
/core/com/lowagie/text/pdf/ColumnText.java1819961287--3UM
/core/com/lowagie/text/pdf/PdfArray.java19294108--1UM
/core/com/lowagie/text/Phrase.java19536220--0UM
/core/com/lowagie/text/FontFactoryImp.java19771595--2UM
/rtf/com/lowagie/text/rtf/parser/destinations/RtfDestinationShppict.java19771655--0UM
/core/com/lowagie/text/pdf/BidiLine.java191638373--1UM
/core/com/lowagie/text/pdf/PdfContentByte.java193160594--3UM
/core/com/lowagie/text/pdf/PdfLine.java110465231--1UM
/core/com/lowagie/text/pdf/PdfCopy.java1101092482--3UM
/core/com/lowagie/text/pdf/PdfEncodings.java1101263465--2UM
/core/com/lowagie/text/pdf/events/PdfPageEventForwarder.java111169142--1UM
/core/com/lowagie/text/pdf/BaseFont.java1111223380--3UM
/core/com/lowagie/text/Table.java1121392666--1UM
/core/com/lowagie/text/pdf/PdfPKCS7.java1121595747--4UM
/core/com/lowagie/text/Document.java113603256--2UM
/core/com/lowagie/text/pdf/PdfCopyFieldsImp.java1131073536--13UM
/core/com/lowagie/text/pdf/PdfPTable.java1141169350--1UM
/core/com/lowagie/text/pdf/XfaForm.java1171258492--7UM
/core/com/lowagie/text/pdf/PdfGraphics2D.java11723301057--2UM
/core/com/lowagie/text/pdf/PdfStamperImp.java11726441412--5UM
/core/com/lowagie/text/pdf/PdfDocument.java11840012029--8UM
/core/com/lowagie/text/pdf/TrueTypeFont.java12021771369--3UM
/core/com/lowagie/text/pdf/PdfReader.java13353812378--5UM
/core/com/lowagie/text/pdf/AcroFields.java13531572601--14UM