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/pdf/Pfm2afm.java1011660--2SM
/core/com/lowagie/text/Font.java107420--1SM
/rtf/com/lowagie/text/rtf/style/RtfFont.java106940--0SM
/toolbox/com/lowagie/toolbox/plugins/Normalize.java106020--0SM
/rtf/com/lowagie/text/rtf/document/RtfDocumentSettings.java104060--1SM
/toolbox/com/lowagie/toolbox/plugins/HtmlBookmarks.java103660--0SM
/core/com/lowagie/text/ElementTags.java103620--0SM
/toolbox/com/lowagie/toolbox/plugins/Add3D.java103560--0SM
/core/com/lowagie/text/pdf/codec/TIFFField.java103560--1SM
/core/com/lowagie/text/pdf/PdfPatternPainter.java103410--0SM
/core/com/lowagie/text/Paragraph.java103370--0SM
/toolbox/com/lowagie/toolbox/plugins/ImageXRefViewer.java103200--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
/rtf/com/lowagie/text/rtf/document/RtfDocumentHeader.java102630--0SM
/toolbox/com/lowagie/toolbox/plugins/Watermarker.java102620--0SM
/toolbox/com/lowagie/toolbox/plugins/Tiff2Pdf.java102520--0SM
/core/com/lowagie/text/Utilities.java102420--0SM
/core/com/lowagie/text/pdf/PdfTemplate.java102320--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/RemoveLaunchApplication.java102080--0SM
/toolbox/com/lowagie/toolbox/plugins/ConcatN.java102080--0SM
/toolbox/com/lowagie/toolbox/plugins/ReversePages.java102000--0SM
/core/com/lowagie/text/html/HtmlTags.java101930--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/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/pdf/PdfFormXObject.java10540--0SM
/core/com/lowagie/text/pdf/PdfPSXObject.java10520--0SM
/core/com/lowagie/text/ImgTemplate.java10460--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
/core/com/lowagie/text/pdf/BarcodePDF417.java11262210--1SM
/core/com/lowagie/text/pdf/codec/wmf/MetaDo.java111364846--0SM
/core/com/lowagie/text/pdf/codec/TIFFFaxDecoder.java111863269--0SM
/core/com/lowagie/text/pdf/BarcodeDatamatrix.java11189426--1SM
/core/com/lowagie/text/pdf/codec/BmpImage.java11185024--1SM
/core/com/lowagie/text/pdf/CFFFont.java111541314--0SM
/core/com/lowagie/text/pdf/codec/PngImage.java111548186--0SM
/core/com/lowagie/text/pdf/codec/Base64.java11153446--0SM
/core/com/lowagie/text/pdf/PushbuttonField.java11804464--0SM
/core/com/lowagie/text/pdf/PdfName.java11123414--1SM
/core/com/lowagie/text/pdf/RandomAccessFileOrArray.java1183923--0SM
/core/com/lowagie/text/pdf/PdfAcroForm.java1170241--1SM
/core/com/lowagie/text/xml/simpleparser/EntitiesToUnicode.java1164446--1SM
/core/com/lowagie/text/Rectangle.java116506--0SM
/rtf/com/lowagie/text/rtf/style/RtfParagraphStyle.java1160032--0SM
/core/com/lowagie/text/xml/simpleparser/EntitiesToSymbol.java1160814--1SM
/core/com/lowagie/text/pdf/PdfAction.java1156644--0SM
/core/com/lowagie/text/pdf/SequenceList.java11474120--0SM
/rtf/com/lowagie/text/rtf/table/RtfBorder.java11424118--0SM
/core/com/lowagie/text/pdf/internal/PdfViewerPreferencesImp.java1147664--0SM
/toolbox/com/lowagie/toolbox/plugins/PhotoAlbum.java11308198--0SM
/rtf/com/lowagie/text/rtf/graphic/RtfImage.java1141662--0SM
/core/com/lowagie/text/html/WebColors.java1138482--0SM
/core/com/lowagie/text/xml/xmp/XmpWriter.java11326102--0SM
/rtf/com/lowagie/text/rtf/RtfMapper.java11237160--0SM
/core/com/lowagie/text/xml/simpleparser/IanaEncodings.java1138014--1SM
/core/com/lowagie/text/pdf/FontDetails.java1132642--1SM
/core/com/lowagie/text/DocWriter.java1130722--0SM
/toolbox/com/lowagie/toolbox/plugins/NUp.java11216106--0SM
/core/com/lowagie/tools/Executable.java1126252--0SM
/core/com/lowagie/text/pdf/hyphenation/Hyphenator.java1124840--1SM
/core/com/lowagie/text/Row.java112806--0SM
/core/com/lowagie/text/pdf/PdfContents.java11158127--0SM
/rups/com/lowagie/rups/view/itext/PagesTable.java1120975--0SM
/core/com/lowagie/text/pdf/FontSelector.java11154118--1SM
/core/com/lowagie/text/pdf/PdfString.java1119640--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/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.java1113314--0SM
/rtf/com/lowagie/text/rtf/style/RtfFontList.java1110836--1SM
/rups/com/lowagie/rups/view/itext/treenodes/XfaTreeNode.java118947--0SM
/core/com/lowagie/text/pdf/draw/VerticalPositionMark.java1111010--0SM
/core/com/lowagie/text/pdf/PdfImportedPage.java1110515--0SM
/core/com/lowagie/text/Element.java111122--0SM
/rtf/com/lowagie/text/rtf/style/RtfColorList.java118622--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
/core/com/lowagie/text/pdf/PdfPattern.java116329--0SM
/core/com/lowagie/text/pdf/PdfICCBased.java116127--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/MarkedObject.java11786--0SM
/core/com/lowagie/text/pdf/PdfLayerMembership.java11706--1SM
/core/com/lowagie/tools/ToolboxAvailable.java114430--0SM
/rtf/com/lowagie/text/rtf/document/RtfGenerator.java114018--0SM
/rtf/com/lowagie/text/rtf/document/RtfCodePage.java114414--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.java1210136--2UM
/core/com/lowagie/text/pdf/GlyphList.java1213412--2UM
/core/com/lowagie/text/pdf/PdfFunction.java1216260--0UM
/core/com/lowagie/text/FontFactory.java1222412--0UM
/rtf/com/lowagie/text/rtf/list/RtfListTable.java1215486--1UM
/core/com/lowagie/text/pdf/PdfLayer.java1224022--1UM
/rups/com/lowagie/rups/model/TreeNodeFactory.java1217999--0UM
/rtf/com/lowagie/text/rtf/RtfWriter2.java1224248--0UM
/rtf/com/lowagie/text/rtf/text/RtfParagraph.java12184120--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/document/RtfPageSetting.java1237682--0UM
/core/com/lowagie/text/pdf/PdfStamper.java1246412--1UM
/rtf/com/lowagie/text/rtf/graphic/RtfShape.java12301188--1UM
/core/com/lowagie/text/html/SAXmyHtmlHandler.java12275224--0UM
/core/com/lowagie/text/pdf/IntHashtable.java1248028--1UM
/core/com/lowagie/text/pdf/Type3Font.java12371172--1UM
/core/com/lowagie/text/html/HtmlTagMap.java12309259--0UM
/rtf/com/lowagie/text/rtf/parser/destinations/RtfDestinationFontTable.java1254626--1UM
/core/com/lowagie/text/pdf/PdfStream.java12381196--0UM
/core/com/lowagie/text/html/Markup.java12452176--0UM
/core/com/lowagie/text/pdf/hyphenation/HyphenationTree.java12498148--1UM
/core/com/lowagie/text/pdf/PdfPCell.java1266412--0UM
/core/com/lowagie/text/pdf/PdfImage.java12395343--0UM
/core/com/lowagie/text/SimpleTable.java12466274--1UM
/core/com/lowagie/text/pdf/codec/GifImage.java1281016--1UM
/core/com/lowagie/text/pdf/BaseField.java1278466--1UM
/rtf/com/lowagie/text/rtf/parser/destinations/RtfDestinationShppict.java12914107--1UM
/core/com/lowagie/text/pdf/TextField.java1298242--1UM
/core/com/lowagie/text/pdf/CJKFont.java12981172--3UM
/rtf/com/lowagie/text/rtf/parser/destinations/RtfDestinationDocument.java12829481--2UM
/core/com/lowagie/text/pdf/PdfPRow.java121060566--0UM
/rtf/com/lowagie/text/rtf/parser/ctrlwords/RtfCtrlWordMap.java1236093595--1UM
/rtf/com/lowagie/text/rtf/style/RtfStylesheetList.java1313460--1UM
/core/com/lowagie/text/pdf/PdfStructureTreeRoot.java1312669--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.java1316054--2UM
/core/com/lowagie/text/pdf/PdfLister.java1317689--0UM
/core/com/lowagie/text/pdf/PdfFileSpecification.java1322771--0UM
/core/com/lowagie/text/pdf/PdfReaderInstance.java1323589--3UM
/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
/core/com/lowagie/text/SimpleCell.java13599146--1UM
/rtf/com/lowagie/text/rtf/parser/properties/RtfProperty.java1367494--2UM
/core/com/lowagie/text/pdf/TrueTypeFontUnicode.java13647266--1UM
/core/com/lowagie/text/xml/simpleparser/SimpleXMLParser.java13101234--2UM
/core/com/lowagie/text/pdf/PdfEncryption.java13824274--0UM
/core/com/lowagie/text/pdf/PdfChunk.java13993395--4UM
/core/com/lowagie/text/Image.java13176586--0UM
/core/com/lowagie/text/pdf/PdfSignatureAppearance.java131839242--1UM
/rtf/com/lowagie/text/rtf/list/RtfListItem.java14173119--1UM
/rtf/com/lowagie/text/rtf/parser/destinations/RtfDestinationColorTable.java1425044--1UM
/rtf/com/lowagie/text/rtf/table/RtfTable.java1422792--1UM
/core/com/lowagie/text/pdf/events/IndexEvents.java1430062--5UM
/core/com/lowagie/text/pdf/PRStream.java14259115--0UM
/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/document/RtfDocument.java14350172--1UM
/core/com/lowagie/text/Section.java1457794--1UM
/core/com/lowagie/text/pdf/MultiColumnText.java14564168--1UM
/core/com/lowagie/text/html/simpleparser/FactoryProperties.java14565234--1UM
/rtf/com/lowagie/text/rtf/table/RtfCell.java14608290--1UM
/core/com/lowagie/text/pdf/PdfAnnotation.java141005109--2UM
/rtf/com/lowagie/text/rtf/parser/RtfParser.java141159190--2UM
/core/com/lowagie/text/pdf/BaseFont.java141234132--3UM
/core/com/lowagie/text/pdf/BidiOrder.java141372142--0UM
/core/com/lowagie/text/xml/SAXiTextHandler.java141178896--2UM
/core/com/lowagie/text/html/HtmlWriter.java141546896--1UM
/rtf/com/lowagie/text/rtf/parser/RtfImportMappings.java157936--4UM
/core/com/lowagie/text/pdf/XfdfReader.java1519074--3UM
/rtf/com/lowagie/text/rtf/text/RtfPhrase.java15164118--1UM
/rtf/com/lowagie/text/rtf/text/RtfSection.java15184150--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
/rtf/com/lowagie/text/rtf/parser/destinations/RtfDestinationListTable.java15288230--0UM
/core/com/lowagie/text/pdf/SimpleNamedDestination.java15452111--2UM
/core/com/lowagie/text/Chunk.java1554072--1UM
/core/com/lowagie/text/Phrase.java15555134--0UM
/core/com/lowagie/text/pdf/BidiLine.java151666458--1UM
/core/com/lowagie/text/pdf/CFFFontSubset.java151828427--10UM
/rtf/com/lowagie/text/rtf/table/RtfBorderGroup.java1617871--1UM
/core/com/lowagie/text/pdf/PdfFormField.java1649484--1UM
/core/com/lowagie/text/pdf/hyphenation/SimplePatternParser.java16411190--2UM
/rtf/com/lowagie/text/rtf/table/RtfRow.java16388269--1UM
/core/com/lowagie/text/pdf/FdfWriter.java16426251--1UM
/core/com/lowagie/text/pdf/TrueTypeFontSubSet.java16653400--3UM
/core/com/lowagie/text/pdf/Type1Font.java161144506--2UM
/core/com/lowagie/text/pdf/PRAcroForm.java17207143--3UM
/core/com/lowagie/text/pdf/hyphenation/TernaryTree.java17806172--2UM
/core/com/lowagie/text/Cell.java17732292--1UM
/core/com/lowagie/text/pdf/codec/TIFFDirectory.java17772322--1UM
/rtf/com/lowagie/text/rtf/list/RtfList.java17702421--7UM
/core/com/lowagie/text/FontFactoryImp.java17788537--2UM
/core/com/lowagie/text/pdf/PdfCell.java17965491--2UM
/core/com/lowagie/text/pdf/SimpleBookmark.java171105366--2UM
/core/com/lowagie/text/pdf/PdfEncodings.java171263383--2UM
/core/com/lowagie/text/pdf/ColumnText.java1720071006--3UM
/rtf/com/lowagie/text/rtf/parser/destinations/RtfDestination.java18191112--1UM
/core/com/lowagie/text/html/simpleparser/HTMLWorker.java181164521--6UM
/core/com/lowagie/text/pdf/PdfGraphics2D.java182330473--2UM
/core/com/lowagie/text/pdf/PdfContentByte.java183160532--3UM
/rtf/com/lowagie/text/rtf/parser/RtfImportMgr.java19195146--4UM
/core/com/lowagie/text/pdf/PdfArray.java19299108--1UM
/rtf/com/lowagie/text/rtf/document/output/RtfByteArrayBuffer.java110326220--1UM
/core/com/lowagie/text/pdf/DocumentFont.java1101003652--1UM
/core/com/lowagie/text/factories/ElementFactory.java110914796--0UM
/core/com/lowagie/text/pdf/events/PdfPageEventForwarder.java111169142--1UM
/core/com/lowagie/text/pdf/PdfCopy.java1111092572--3UM
/core/com/lowagie/text/pdf/PdfLine.java112496282--1UM
/core/com/lowagie/text/Table.java1121392666--1UM
/core/com/lowagie/text/pdf/PdfPKCS7.java1121601757--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/PdfDocument.java11740661479--8UM
/core/com/lowagie/text/pdf/XfaForm.java1181292497--7UM
/core/com/lowagie/text/pdf/TrueTypeFont.java11822281272--4UM
/core/com/lowagie/text/pdf/PdfStamperImp.java11927751542--5UM
/core/com/lowagie/text/pdf/PdfReader.java13453842395--5UM
/core/com/lowagie/text/pdf/AcroFields.java13531822601--14UM