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.java107570--1SM
/core/com/lowagie/text/pdf/PdfAction.java105660--0SM
/core/com/lowagie/text/html/simpleparser/FactoryProperties.java104280--1SM
/core/com/lowagie/text/pdf/codec/TIFFField.java103560--1SM
/core/com/lowagie/text/Paragraph.java103430--0SM
/core/com/lowagie/text/html/HtmlTagMap.java103080--0SM
/core/com/lowagie/text/xml/XmlParser.java103020--0SM
/core/com/lowagie/text/pdf/PdfContentParser.java101880--0SM
/core/com/lowagie/text/xml/TagMap.java101660--1SM
/core/com/lowagie/text/pdf/PdfEncryptor.java101560--0SM
/core/com/lowagie/text/pdf/PdfFont.java101410--1SM
/core/com/lowagie/text/pdf/PdfCopyFields.java101330--0SM
/core/com/lowagie/text/ListItem.java101140--0SM
/core/com/lowagie/text/GreekList.java10930--0SM
/core/com/lowagie/text/pdf/PdfPage.java10840--0SM
/core/com/lowagie/text/RomanList.java10830--0SM
/core/com/lowagie/text/Header.java10250--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/TextElementArray.java1090--0SM
/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/pdf/PdfPRow.java111044156--0SM
/core/com/lowagie/text/factories/ElementFactory.java11896138--0SM
/core/com/lowagie/text/pdf/PdfEncryption.java1180226--0SM
/core/com/lowagie/text/pdf/PdfAcroForm.java1170241--1SM
/core/com/lowagie/text/Rectangle.java116956--0SM
/core/com/lowagie/text/Jpeg.java11406290--0SM
/core/com/lowagie/text/xml/simpleparser/EntitiesToUnicode.java1164446--1SM
/core/com/lowagie/text/pdf/PdfPCell.java1164814--0SM
/core/com/lowagie/text/xml/simpleparser/EntitiesToSymbol.java1160814--1SM
/core/com/lowagie/text/pdf/SequenceList.java11474120--0SM
/core/com/lowagie/text/pdf/PdfStream.java11372144--0SM
/core/com/lowagie/text/html/Markup.java1140088--0SM
/core/com/lowagie/text/html/WebColors.java1138482--0SM
/core/com/lowagie/text/pdf/PdfStamper.java114506--1SM
/core/com/lowagie/text/xml/xmp/XmpWriter.java11326102--0SM
/core/com/lowagie/text/xml/simpleparser/IanaEncodings.java1138014--1SM
/rups/com/lowagie/rups/controller/RupsController.java1126874--0SM
/core/com/lowagie/text/DocWriter.java1130722--0SM
/rups/com/lowagie/rups/controller/PdfReaderController.java1127354--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/model/TreeNodeFactory.java1117866--0SM
/core/com/lowagie/text/pdf/MappedRandomAccessFile.java1119040--0SM
/core/com/lowagie/text/pdf/PdfAppearance.java1118042--1SM
/core/com/lowagie/tools/concat_pdf.java1111996--0SM
/core/com/lowagie/text/pdf/events/FieldPositioningEvents.java1116442--1SM
/core/com/lowagie/text/pdf/PdfNumberTree.java1119012--0SM
/core/com/lowagie/text/pdf/PdfNameTree.java1119012--0SM
/core/com/lowagie/text/MarkedSection.java1117526--0SM
/core/com/lowagie/text/pdf/FontSelector.java1111480--1SM
/core/com/lowagie/text/Utilities.java1114448--0SM
/core/com/lowagie/text/pdf/EnumerateTTC.java1111272--0SM
/core/com/lowagie/tools/encrypt_pdf.java1112852--0SM
/core/com/lowagie/text/Meta.java111646--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
/core/com/lowagie/text/Element.java111102--0SM
/rups/com/lowagie/rups/view/models/DictionaryTableModel.java118410--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/PdfTextArray.java11506--1SM
/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.java126024--0UM
/core/com/lowagie/text/xml/SAXmyHandler.java127450--1UM
/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.java1221512--0UM
/core/com/lowagie/text/pdf/PdfLayer.java1223422--1UM
/core/com/lowagie/text/Anchor.java1223088--0UM
/core/com/lowagie/text/pdf/PageResources.java1225376--2UM
/core/com/lowagie/text/Annotation.java1237312--1UM
/core/com/lowagie/text/pdf/FontDetails.java12310172--1UM
/core/com/lowagie/text/html/SAXmyHtmlHandler.java12275224--0UM
/core/com/lowagie/text/pdf/IntHashtable.java1248028--1UM
/core/com/lowagie/text/pdf/hyphenation/SimplePatternParser.java12408104--1UM
/core/com/lowagie/text/pdf/Type3Font.java12368172--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/PdfName.java12122998--1UM
/core/com/lowagie/text/pdf/CFFFont.java121541474--0UM
/core/com/lowagie/text/pdf/codec/TIFFFaxDecoder.java121862456--0UM
/core/com/lowagie/text/pdf/PdfStructureTreeRoot.java1312669--1UM
/core/com/lowagie/text/html/simpleparser/IncTable.java1314172--3UM
/core/com/lowagie/text/html/simpleparser/ChainedProperties.java1316054--1UM
/core/com/lowagie/text/pdf/PdfLister.java1317689--0UM
/core/com/lowagie/text/pdf/PdfSmartCopy.java1327092--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/pdf/BarcodeCodabar.java13426262--0UM
/core/com/lowagie/text/SimpleCell.java13599146--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/CJKFont.java13978200--3UM
/core/com/lowagie/text/pdf/PdfChunk.java13930390--4UM
/core/com/lowagie/text/Image.java13181186--0UM
/core/com/lowagie/text/pdf/PdfSignatureAppearance.java131837242--1UM
/core/com/lowagie/text/pdf/BarcodePDF417.java13262284--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.java1443774--1UM
/core/com/lowagie/text/Section.java1459294--1UM
/core/com/lowagie/text/pdf/MultiColumnText.java14564168--1UM
/core/com/lowagie/text/pdf/TrueTypeFontUnicode.java14673282--1UM
/core/com/lowagie/text/pdf/BidiOrder.java141372142--0UM
/core/com/lowagie/text/xml/SAXiTextHandler.java141145864--2UM
/core/com/lowagie/text/pdf/codec/BmpImage.java141850174--1UM
/core/com/lowagie/text/pdf/CFFFontSubset.java141827366--10UM
/core/com/lowagie/text/html/HtmlWriter.java141546896--1UM
/core/com/lowagie/text/pdf/XfdfReader.java1519074--3UM
/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.java1551273--1UM
/core/com/lowagie/text/Phrase.java15534134--0UM
/core/com/lowagie/text/pdf/Type1Font.java151144452--2UM
/core/com/lowagie/text/pdf/PdfFormField.java1649484--1UM
/core/com/lowagie/text/pdf/SimpleNamedDestination.java16452147--2UM
/core/com/lowagie/text/pdf/FdfWriter.java16421248--1UM
/core/com/lowagie/text/pdf/BidiLine.java161606492--1UM
/core/com/lowagie/text/pdf/ColumnText.java161941942--3UM
/core/com/lowagie/text/pdf/PRAcroForm.java17207143--3UM
/core/com/lowagie/text/Cell.java17787292--1UM
/core/com/lowagie/text/pdf/TrueTypeFontSubSet.java17653430--3UM
/core/com/lowagie/text/pdf/codec/TIFFDirectory.java17772322--1UM
/core/com/lowagie/text/FontFactoryImp.java17751537--2UM
/core/com/lowagie/text/pdf/SimpleBookmark.java171097362--2UM
/core/com/lowagie/text/pdf/PdfCell.java17976491--2UM
/core/com/lowagie/text/html/simpleparser/HTMLWorker.java171118498--5UM
/core/com/lowagie/text/pdf/hyphenation/TernaryTree.java18806204--2UM
/core/com/lowagie/text/pdf/PdfArray.java19294108--1UM
/core/com/lowagie/text/pdf/PdfContentByte.java193162594--3UM
/core/com/lowagie/text/pdf/PdfLine.java110432220--1UM
/core/com/lowagie/text/pdf/PdfCopy.java1101092482--3UM
/core/com/lowagie/text/pdf/PdfEncodings.java1101262464--2UM
/core/com/lowagie/text/pdf/events/PdfPageEventForwarder.java111169142--1UM
/core/com/lowagie/text/pdf/BaseFont.java1111227396--3UM
/core/com/lowagie/text/pdf/DocumentFont.java111986657--1UM
/core/com/lowagie/text/Table.java1121460666--1UM
/core/com/lowagie/text/pdf/PdfPKCS7.java1121593744--4UM
/core/com/lowagie/text/Document.java113603256--2UM
/core/com/lowagie/text/pdf/PdfPTable.java1131139328--1UM
/core/com/lowagie/text/pdf/PdfCopyFieldsImp.java1131071535--13UM
/core/com/lowagie/text/pdf/PdfGraphics2D.java11623161021--2UM
/core/com/lowagie/text/pdf/PdfStamperImp.java11624631370--5UM
/core/com/lowagie/text/pdf/XfaForm.java1171258492--7UM
/core/com/lowagie/text/pdf/PdfDocument.java11839351560--8UM
/core/com/lowagie/text/pdf/TrueTypeFont.java12021391352--3UM
/core/com/lowagie/text/pdf/PdfReader.java13453812478--5UM
/core/com/lowagie/text/pdf/AcroFields.java13531582602--14UM