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
/com/lowagie/text/pdf/PdfAction.java102830--0SM
/com/lowagie/text/pdf/internal/PdfViewerPreferencesImp.java102380--1SM
/com/lowagie/text/Paragraph.java101810--0SM
/com/lowagie/text/pdf/codec/TIFFField.java101780--1SM
/com/lowagie/text/html/HtmlTagMap.java101540--0SM
/com/lowagie/text/xml/XmlParser.java101510--0SM
/com/lowagie/text/pdf/PdfContentParser.java10940--0SM
/com/lowagie/text/xml/TagMap.java10830--1SM
/com/lowagie/text/pdf/PdfCopyFields.java10670--0SM
/com/lowagie/text/pdf/PdfFont.java10670--1SM
/com/lowagie/text/rtf/field/RtfTOCEntry.java10580--0SM
/com/lowagie/text/pdf/PdfPage.java10420--0SM
/com/lowagie/text/pdf/ExtendedColor.java10350--1SM
/com/lowagie/text/xml/simpleparser/SimpleXMLDocHandler.java1090--0SM
/com/lowagie/text/pdf/hyphenation/PatternConsumer.java1070--0SM
/com/lowagie/text/html/simpleparser/Img.java1070--0SM
/com/lowagie/text/pdf/ExtraEncoding.java1060--0SM
/com/lowagie/text/TextElementArray.java1050--0SM
/com/lowagie/text/pdf/codec/wmf/MetaDo.java11682423--0SM
/com/lowagie/text/pdf/BarcodeDatamatrix.java1194713--1SM
/com/lowagie/text/pdf/codec/PngImage.java11772174--0SM
/com/lowagie/text/pdf/Barcode128.java11629124--0SM
/com/lowagie/text/pdf/PushbuttonField.java11402232--0SM
/com/lowagie/text/pdf/PdfPRow.java1152278--0SM
/com/lowagie/text/factories/ElementFactory.java1144869--0SM
/com/lowagie/text/pdf/RandomAccessFileOrArray.java1140712--0SM
/com/lowagie/text/Font.java1138336--1SM
/com/lowagie/text/rtf/RtfCell.java1133850--0SM
/com/lowagie/text/pdf/PdfAcroForm.java1135020--1SM
/com/lowagie/text/Rectangle.java113643--0SM
/com/lowagie/text/pdf/PdfImage.java11197164--0SM
/com/lowagie/text/rtf/style/RtfParagraphStyle.java1132820--0SM
/com/lowagie/text/Jpeg.java11203145--0SM
/com/lowagie/text/xml/simpleparser/EntitiesToUnicode.java1132223--1SM
/com/lowagie/text/xml/simpleparser/EntitiesToSymbol.java113047--1SM
/com/lowagie/text/pdf/SequenceList.java1123760--0SM
/com/lowagie/text/pdf/PdfStream.java1118672--0SM
/com/lowagie/text/html/simpleparser/FactoryProperties.java1121433--1SM
/com/lowagie/text/html/Markup.java1120044--0SM
/com/lowagie/text/html/WebColors.java1119241--0SM
/com/lowagie/text/rtf/graphic/RtfShapeProperty.java1115475--0SM
/com/lowagie/text/pdf/PdfStamper.java112253--1SM
/com/lowagie/text/rtf/document/RtfDocument.java112169--1SM
/com/lowagie/text/xml/simpleparser/IanaEncodings.java111907--1SM
/com/lowagie/text/pdf/PdfDate.java1114451--0SM
/com/lowagie/text/DocWriter.java1115210--0SM
/com/lowagie/tools/Executable.java1113126--0SM
/com/lowagie/text/pdf/codec/wmf/MetaFont.java111503--0SM
/com/lowagie/text/pdf/hyphenation/Hyphenator.java1112420--1SM
/com/lowagie/text/Row.java111343--0SM
/com/lowagie/tools/BuildTutorial.java1110036--0SM
/com/lowagie/text/pdf/PdfFileSpecification.java111113--0SM
/com/lowagie/text/pdf/MappedRandomAccessFile.java119220--0SM
/com/lowagie/text/pdf/PdfAppearance.java119021--1SM
/com/lowagie/tools/concat_pdf.java116048--0SM
/com/lowagie/text/pdf/events/FieldPositioningEvents.java118221--1SM
/com/lowagie/text/pdf/PdfNumberTree.java11956--0SM
/com/lowagie/text/pdf/PdfNameTree.java11956--0SM
/com/lowagie/text/pdf/FontSelector.java115740--1SM
/com/lowagie/text/pdf/EnumerateTTC.java115636--0SM
/com/lowagie/tools/encrypt_pdf.java116426--1SM
/com/lowagie/text/pdf/PdfEncryptor.java117812--0SM
/com/lowagie/text/rtf/style/RtfFontList.java116818--1SM
/com/lowagie/text/Meta.java11793--0SM
/com/lowagie/text/pdf/hyphenation/CharVector.java11765--0SM
/com/lowagie/text/html/simpleparser/IncCell.java11723--1SM
/com/lowagie/text/rtf/style/RtfColorList.java115711--1SM
/com/lowagie/text/Element.java11531--0SM
/com/lowagie/text/rtf/text/RtfChapter.java113716--0SM
/com/lowagie/text/pdf/PdfICCBased.java112924--0SM
/com/lowagie/text/xml/xmp/LangAlt.java11339--0SM
/com/lowagie/text/rtf/field/RtfAnchor.java11384--0SM
/com/lowagie/text/pdf/CMYKColor.java11393--0SM
/com/lowagie/text/ImgCCITT.java112517--0SM
/com/lowagie/text/xml/xmp/XmpArray.java112614--0SM
/com/lowagie/text/rtf/field/RtfTotalPageNumber.java11364--0SM
/com/lowagie/text/pdf/PdfLayerMembership.java11353--1SM
/com/lowagie/tools/ToolboxAvailable.java112215--0SM
/com/lowagie/text/pdf/SpotColor.java11298--0SM
/com/lowagie/text/MarkedObject.java11333--0SM
/com/lowagie/text/pdf/PdfTextArray.java11253--1SM
/com/lowagie/text/pdf/GrayColor.java11233--0SM
/com/lowagie/text/pdf/events/PdfPCellEventForwarder.java11186--1SM
/com/lowagie/text/pdf/events/PdfPTableEventForwarder.java11165--1SM
/com/lowagie/text/pdf/ByteBuffer.java0103--0UM
/com/lowagie/text/rtf/field/RtfTableOfContents.java12298--0UM
/com/lowagie/text/Chapter.java123112--0UM
/com/lowagie/text/rtf/text/RtfTabGroup.java12399--1UM
/com/lowagie/text/rtf/document/RtfInfoGroup.java123815--1UM
/com/lowagie/text/xml/SAXmyHandler.java123725--1UM
/com/lowagie/text/html/simpleparser/StyleSheet.java125018--2UM
/com/lowagie/text/pdf/collection/PdfCollectionSort.java124525--0UM
/com/lowagie/text/pdf/internal/PolylineShapeIterator.java124624--0UM
/com/lowagie/text/pdf/GlyphList.java12676--2UM
/com/lowagie/text/GreekList.java125326--0UM
/com/lowagie/text/Utilities.java127232--0UM
/com/lowagie/text/FontFactory.java121066--0UM
/com/lowagie/text/pdf/PdfSmartCopy.java127837--1UM
/com/lowagie/text/pdf/PdfLayer.java1211711--1UM
/com/lowagie/text/MarkedSection.java1210033--0UM
/com/lowagie/text/rtf/list/RtfListTable.java129545--1UM
/com/lowagie/text/rtf/text/RtfParagraph.java129957--0UM
/com/lowagie/text/Anchor.java1212144--0UM
/com/lowagie/text/pdf/PageResources.java1212738--2UM
/com/lowagie/text/rtf/direct/RtfParser.java1211848--0UM
/com/lowagie/text/Annotation.java121826--1UM
/com/lowagie/text/pdf/internal/PdfXConformanceImp.java1216634--0UM
/com/lowagie/text/pdf/FontDetails.java1215586--1UM
/com/lowagie/text/html/SAXmyHtmlHandler.java12137112--0UM
/com/lowagie/text/pdf/hyphenation/SimplePatternParser.java1220452--1UM
/com/lowagie/text/rtf/graphic/RtfShape.java1216195--1UM
/com/lowagie/text/pdf/Type3Font.java1218186--1UM
/com/lowagie/text/pdf/hyphenation/HyphenationTree.java1224974--1UM
/com/lowagie/text/SimpleTable.java12236137--1UM
/com/lowagie/text/pdf/PdfEncryption.java1240130--0UM
/com/lowagie/text/pdf/codec/CCITTG4Encoder.java1247458--0UM
/com/lowagie/text/pdf/CJKFont.java1248686--3UM
/com/lowagie/text/pdf/PdfChunk.java12464178--4UM
/com/lowagie/text/pdf/PdfName.java1261449--1UM
/com/lowagie/text/pdf/CFFFont.java12767234--0UM
/com/lowagie/text/pdf/codec/TIFFFaxDecoder.java12931228--0UM
/com/lowagie/text/rtf/direct/RtfImportMappings.java132310--2UM
/com/lowagie/text/rtf/field/RtfPageNumber.java13339--0UM
/com/lowagie/text/rtf/direct/RtfImportHeader.java133919--2UM
/com/lowagie/text/pdf/PdfStructureTreeRoot.java136234--1UM
/com/lowagie/text/rtf/style/RtfStylesheetList.java138030--1UM
/com/lowagie/text/html/simpleparser/ChainedProperties.java138427--1UM
/com/lowagie/text/html/simpleparser/IncTable.java137636--3UM
/com/lowagie/text/pdf/PdfLister.java138643--0UM
/com/lowagie/text/rtf/RtfTable.java138968--1UM
/com/lowagie/text/rtf/document/output/RtfByteArrayBuffer.java1316228--1UM
/com/lowagie/text/pdf/PdfOutline.java1318221--1UM
/com/lowagie/text/rtf/field/RtfField.java1319223--0UM
/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java1318443--1UM
/com/lowagie/text/pdf/internal/PdfAnnotationsImp.java1316075--2UM
/com/lowagie/text/pdf/IntHashtable.java1324021--1UM
/com/lowagie/text/pdf/codec/wmf/MetaState.java1324776--2UM
/com/lowagie/text/pdf/BarcodeCodabar.java13213131--0UM
/com/lowagie/text/rtf/table/RtfCell.java1326792--1UM
/com/lowagie/text/rtf/RtfRow.java13240153--1UM
/com/lowagie/text/pdf/BaseField.java13392112--1UM
/com/lowagie/text/pdf/TextField.java1349132--1UM
/com/lowagie/text/xml/simpleparser/SimpleXMLParser.java1350617--2UM
/com/lowagie/text/pdf/PdfAnnotation.java1350134--1UM
/com/lowagie/text/pdf/codec/GifImage.java13405133--1UM
/com/lowagie/text/pdf/PdfSignatureAppearance.java13916120--1UM
/com/lowagie/text/rtf/table/RtfTable.java1410239--1UM
/com/lowagie/text/pdf/events/IndexEvents.java1414931--5UM
/com/lowagie/text/pdf/PdfReaderInstance.java1411778--3UM
/com/lowagie/text/xml/xmp/XmpWriter.java1416136--0UM
/com/lowagie/text/pdf/DefaultFontMapper.java1417435--2UM
/com/lowagie/text/pdf/PdfPages.java1412594--2UM
/com/lowagie/text/pdf/VerticalText.java1416554--1UM
/com/lowagie/text/pdf/PdfPageLabels.java1416071--1UM
/com/lowagie/text/List.java1422937--1UM
/com/lowagie/text/Section.java1426343--1UM
/com/lowagie/text/pdf/MultiColumnText.java1427684--1UM
/com/lowagie/text/SimpleCell.java14303100--1UM
/com/lowagie/text/pdf/BidiOrder.java1468671--0UM
/com/lowagie/text/pdf/codec/TiffImage.java14478424--0UM
/com/lowagie/text/pdf/codec/BmpImage.java1492587--1UM
/com/lowagie/text/pdf/CFFFontSubset.java14910180--10UM
/com/lowagie/text/html/HtmlWriter.java14769448--1UM
/com/lowagie/text/xml/xmp/XmpSchema.java156619--0UM
/com/lowagie/text/pdf/XfdfReader.java159537--3UM
/com/lowagie/text/rtf/text/RtfPhrase.java158955--1UM
/com/lowagie/text/rtf/list/RtfListItem.java159360--0UM
/com/lowagie/text/rtf/text/RtfSection.java159568--1UM
/com/lowagie/text/pdf/PdfTable.java1513187--2UM
/com/lowagie/text/Chunk.java1525736--1UM
/com/lowagie/text/html/simpleparser/HTMLWorker.java15558194--6UM
/com/lowagie/text/pdf/BidiLine.java15801204--2UM
/com/lowagie/text/Image.java15936160--0UM
/com/lowagie/text/pdf/BarcodePDF417.java151311174--1UM
/com/lowagie/text/rtf/table/RtfBorderGroup.java1610339--1UM
/com/lowagie/text/pdf/PdfDictionary.java1616040--1UM
/com/lowagie/text/pdf/FdfReader.java1612094--1UM
/com/lowagie/text/pdf/PdfFormField.java1624643--1UM
/com/lowagie/text/pdf/SimpleNamedDestination.java1622373--2UM
/com/lowagie/text/pdf/FdfWriter.java16208123--1UM
/com/lowagie/text/pdf/TrueTypeFontUnicode.java16337164--1UM
/com/lowagie/text/FontFactoryImp.java16373202--1UM
/com/lowagie/text/pdf/PdfCell.java16492233--2UM
/com/lowagie/text/pdf/Type1Font.java16569257--2UM
/com/lowagie/text/xml/SAXiTextHandler.java16573479--2UM
/com/lowagie/text/pdf/ColumnText.java16970471--3UM
/com/lowagie/text/pdf/PRAcroForm.java1710371--3UM
/com/lowagie/text/rtf/table/RtfRow.java1720390--1UM
/com/lowagie/text/pdf/TrueTypeFontSubSet.java17327215--3UM
/com/lowagie/text/Cell.java17427146--1UM
/com/lowagie/text/pdf/SimpleBookmark.java17547181--2UM
/com/lowagie/text/pdf/hyphenation/TernaryTree.java18403102--2UM
/com/lowagie/text/pdf/codec/TIFFDirectory.java18386193--1UM
/com/lowagie/text/pdf/DocumentFont.java18485274--1UM
/com/lowagie/text/pdf/PdfArray.java1914754--1UM
/com/lowagie/text/rtf/list/RtfList.java19404267--1UM
/com/lowagie/text/pdf/PdfLine.java110216110--1UM
/com/lowagie/text/pdf/PdfEncodings.java110631219--2UM
/com/lowagie/text/pdf/PdfContentByte.java1101582308--3UM
/com/lowagie/text/pdf/events/PdfPageEventForwarder.java1117360--1UM
/com/lowagie/text/pdf/PdfCopy.java111544187--2UM
/com/lowagie/text/rtf/RtfWriter.java1111406475--3UM
/com/lowagie/text/Phrase.java112272123--1UM
/com/lowagie/text/pdf/PdfPKCS7.java112797372--4UM
/com/lowagie/text/Document.java113305132--2UM
/com/lowagie/text/pdf/PdfPTable.java113550162--1UM
/com/lowagie/text/pdf/BaseFont.java114603220--3UM
/com/lowagie/text/pdf/PdfCopyFieldsImp.java115532307--13UM
/com/lowagie/text/pdf/PdfGraphics2D.java1161119492--2UM
/com/lowagie/text/pdf/XfaForm.java117628246--7UM
/com/lowagie/text/pdf/PdfStamperImp.java1171227693--5UM
/com/lowagie/text/pdf/TrueTypeFont.java1181045602--3UM
/com/lowagie/text/pdf/PdfDocument.java12319821151--7UM
/com/lowagie/text/Table.java127735439--1UM
/com/lowagie/text/pdf/PdfReader.java13426841220--5UM
/com/lowagie/text/pdf/AcroFields.java13515751218--14UM