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.
| C | CL | SC | CM |
---|
File | UM | SM | UM | SM | UM | SM |
---|
/core/com/lowagie/text/Font.java | 1 | 0 | 757 | 0 | -- | 1 | SM |
/core/com/lowagie/text/pdf/PdfAction.java | 1 | 0 | 566 | 0 | -- | 0 | SM |
/core/com/lowagie/text/html/simpleparser/FactoryProperties.java | 1 | 0 | 428 | 0 | -- | 1 | SM |
/core/com/lowagie/text/pdf/codec/TIFFField.java | 1 | 0 | 356 | 0 | -- | 1 | SM |
/core/com/lowagie/text/Paragraph.java | 1 | 0 | 343 | 0 | -- | 0 | SM |
/core/com/lowagie/text/html/HtmlTagMap.java | 1 | 0 | 308 | 0 | -- | 0 | SM |
/core/com/lowagie/text/xml/XmlParser.java | 1 | 0 | 302 | 0 | -- | 0 | SM |
/core/com/lowagie/text/pdf/PdfContentParser.java | 1 | 0 | 188 | 0 | -- | 0 | SM |
/core/com/lowagie/text/xml/TagMap.java | 1 | 0 | 166 | 0 | -- | 1 | SM |
/core/com/lowagie/text/pdf/PdfEncryptor.java | 1 | 0 | 156 | 0 | -- | 0 | SM |
/core/com/lowagie/text/pdf/PdfFont.java | 1 | 0 | 141 | 0 | -- | 1 | SM |
/core/com/lowagie/text/pdf/PdfCopyFields.java | 1 | 0 | 133 | 0 | -- | 0 | SM |
/core/com/lowagie/text/ListItem.java | 1 | 0 | 114 | 0 | -- | 0 | SM |
/core/com/lowagie/text/GreekList.java | 1 | 0 | 93 | 0 | -- | 0 | SM |
/core/com/lowagie/text/pdf/PdfPage.java | 1 | 0 | 84 | 0 | -- | 0 | SM |
/core/com/lowagie/text/RomanList.java | 1 | 0 | 83 | 0 | -- | 0 | SM |
/core/com/lowagie/text/Header.java | 1 | 0 | 25 | 0 | -- | 0 | SM |
/core/com/lowagie/text/xml/simpleparser/SimpleXMLDocHandler.java | 1 | 0 | 18 | 0 | -- | 0 | SM |
/core/com/lowagie/text/pdf/hyphenation/PatternConsumer.java | 1 | 0 | 14 | 0 | -- | 0 | SM |
/core/com/lowagie/text/html/simpleparser/Img.java | 1 | 0 | 14 | 0 | -- | 0 | SM |
/core/com/lowagie/text/TextElementArray.java | 1 | 0 | 9 | 0 | -- | 0 | SM |
/core/com/lowagie/text/pdf/codec/wmf/MetaDo.java | 1 | 1 | 1364 | 846 | -- | 0 | SM |
/core/com/lowagie/text/pdf/BarcodeDatamatrix.java | 1 | 1 | 1894 | 26 | -- | 1 | SM |
/core/com/lowagie/text/pdf/codec/PngImage.java | 1 | 1 | 1544 | 348 | -- | 0 | SM |
/core/com/lowagie/text/pdf/codec/Base64.java | 1 | 1 | 1536 | 74 | -- | 0 | SM |
/core/com/lowagie/text/pdf/Barcode128.java | 1 | 1 | 1258 | 248 | -- | 0 | SM |
/core/com/lowagie/text/pdf/PushbuttonField.java | 1 | 1 | 804 | 464 | -- | 0 | SM |
/core/com/lowagie/text/pdf/PdfPRow.java | 1 | 1 | 1044 | 156 | -- | 0 | SM |
/core/com/lowagie/text/factories/ElementFactory.java | 1 | 1 | 896 | 138 | -- | 0 | SM |
/core/com/lowagie/text/pdf/PdfEncryption.java | 1 | 1 | 802 | 26 | -- | 0 | SM |
/core/com/lowagie/text/pdf/PdfAcroForm.java | 1 | 1 | 702 | 41 | -- | 1 | SM |
/core/com/lowagie/text/Rectangle.java | 1 | 1 | 695 | 6 | -- | 0 | SM |
/core/com/lowagie/text/Jpeg.java | 1 | 1 | 406 | 290 | -- | 0 | SM |
/core/com/lowagie/text/xml/simpleparser/EntitiesToUnicode.java | 1 | 1 | 644 | 46 | -- | 1 | SM |
/core/com/lowagie/text/pdf/PdfPCell.java | 1 | 1 | 648 | 14 | -- | 0 | SM |
/core/com/lowagie/text/xml/simpleparser/EntitiesToSymbol.java | 1 | 1 | 608 | 14 | -- | 1 | SM |
/core/com/lowagie/text/pdf/SequenceList.java | 1 | 1 | 474 | 120 | -- | 0 | SM |
/core/com/lowagie/text/pdf/PdfStream.java | 1 | 1 | 372 | 144 | -- | 0 | SM |
/core/com/lowagie/text/html/Markup.java | 1 | 1 | 400 | 88 | -- | 0 | SM |
/core/com/lowagie/text/html/WebColors.java | 1 | 1 | 384 | 82 | -- | 0 | SM |
/core/com/lowagie/text/pdf/PdfStamper.java | 1 | 1 | 450 | 6 | -- | 1 | SM |
/core/com/lowagie/text/xml/xmp/XmpWriter.java | 1 | 1 | 326 | 102 | -- | 0 | SM |
/core/com/lowagie/text/xml/simpleparser/IanaEncodings.java | 1 | 1 | 380 | 14 | -- | 1 | SM |
/rups/com/lowagie/rups/controller/RupsController.java | 1 | 1 | 268 | 74 | -- | 0 | SM |
/core/com/lowagie/text/DocWriter.java | 1 | 1 | 307 | 22 | -- | 0 | SM |
/rups/com/lowagie/rups/controller/PdfReaderController.java | 1 | 1 | 273 | 54 | -- | 0 | SM |
/core/com/lowagie/tools/Executable.java | 1 | 1 | 262 | 52 | -- | 0 | SM |
/core/com/lowagie/text/pdf/hyphenation/Hyphenator.java | 1 | 1 | 248 | 40 | -- | 1 | SM |
/core/com/lowagie/text/Row.java | 1 | 1 | 280 | 6 | -- | 0 | SM |
/rups/com/lowagie/rups/model/TreeNodeFactory.java | 1 | 1 | 178 | 66 | -- | 0 | SM |
/core/com/lowagie/text/pdf/MappedRandomAccessFile.java | 1 | 1 | 190 | 40 | -- | 0 | SM |
/core/com/lowagie/text/pdf/PdfAppearance.java | 1 | 1 | 180 | 42 | -- | 1 | SM |
/core/com/lowagie/tools/concat_pdf.java | 1 | 1 | 119 | 96 | -- | 0 | SM |
/core/com/lowagie/text/pdf/events/FieldPositioningEvents.java | 1 | 1 | 164 | 42 | -- | 1 | SM |
/core/com/lowagie/text/pdf/PdfNumberTree.java | 1 | 1 | 190 | 12 | -- | 0 | SM |
/core/com/lowagie/text/pdf/PdfNameTree.java | 1 | 1 | 190 | 12 | -- | 0 | SM |
/core/com/lowagie/text/MarkedSection.java | 1 | 1 | 175 | 26 | -- | 0 | SM |
/core/com/lowagie/text/pdf/FontSelector.java | 1 | 1 | 114 | 80 | -- | 1 | SM |
/core/com/lowagie/text/Utilities.java | 1 | 1 | 144 | 48 | -- | 0 | SM |
/core/com/lowagie/text/pdf/EnumerateTTC.java | 1 | 1 | 112 | 72 | -- | 0 | SM |
/core/com/lowagie/tools/encrypt_pdf.java | 1 | 1 | 128 | 52 | -- | 0 | SM |
/core/com/lowagie/text/Meta.java | 1 | 1 | 164 | 6 | -- | 0 | SM |
/core/com/lowagie/text/pdf/hyphenation/CharVector.java | 1 | 1 | 152 | 10 | -- | 0 | SM |
/core/com/lowagie/text/html/simpleparser/IncCell.java | 1 | 1 | 152 | 6 | -- | 1 | SM |
/core/com/lowagie/text/xml/xmp/XmpSchema.java | 1 | 1 | 132 | 14 | -- | 0 | SM |
/core/com/lowagie/text/Element.java | 1 | 1 | 110 | 2 | -- | 0 | SM |
/rups/com/lowagie/rups/view/models/DictionaryTableModel.java | 1 | 1 | 84 | 10 | -- | 0 | SM |
/core/com/lowagie/text/xml/xmp/XmpArray.java | 1 | 1 | 55 | 30 | -- | 0 | SM |
/core/com/lowagie/text/xml/xmp/LangAlt.java | 1 | 1 | 66 | 18 | -- | 0 | SM |
/core/com/lowagie/text/pdf/CMYKColor.java | 1 | 1 | 78 | 6 | -- | 0 | SM |
/core/com/lowagie/text/MarkedObject.java | 1 | 1 | 78 | 6 | -- | 0 | SM |
/core/com/lowagie/text/pdf/PdfLayerMembership.java | 1 | 1 | 70 | 6 | -- | 1 | SM |
/core/com/lowagie/tools/ToolboxAvailable.java | 1 | 1 | 44 | 30 | -- | 0 | SM |
/core/com/lowagie/text/pdf/SpotColor.java | 1 | 1 | 58 | 16 | -- | 0 | SM |
/core/com/lowagie/text/pdf/PdfTextArray.java | 1 | 1 | 50 | 6 | -- | 1 | SM |
/core/com/lowagie/text/pdf/GrayColor.java | 1 | 1 | 46 | 6 | -- | 0 | SM |
/core/com/lowagie/text/pdf/events/PdfPCellEventForwarder.java | 1 | 1 | 38 | 13 | -- | 1 | SM |
/core/com/lowagie/text/pdf/events/PdfPTableEventForwarder.java | 1 | 1 | 35 | 12 | -- | 1 | SM |
/core/com/lowagie/text/pdf/ByteBuffer.java | 0 | 1 | 0 | 6 | -- | 0 | UM |
/core/com/lowagie/text/Chapter.java | 1 | 2 | 60 | 24 | -- | 0 | UM |
/core/com/lowagie/text/xml/SAXmyHandler.java | 1 | 2 | 74 | 50 | -- | 1 | UM |
/core/com/lowagie/text/html/simpleparser/StyleSheet.java | 1 | 2 | 100 | 36 | -- | 2 | UM |
/core/com/lowagie/text/pdf/collection/PdfCollectionSort.java | 1 | 2 | 90 | 50 | -- | 0 | UM |
/core/com/lowagie/text/pdf/internal/PolylineShapeIterator.java | 1 | 2 | 92 | 48 | -- | 0 | UM |
/core/com/lowagie/text/pdf/GlyphList.java | 1 | 2 | 134 | 12 | -- | 2 | UM |
/core/com/lowagie/text/FontFactory.java | 1 | 2 | 215 | 12 | -- | 0 | UM |
/core/com/lowagie/text/pdf/PdfLayer.java | 1 | 2 | 234 | 22 | -- | 1 | UM |
/core/com/lowagie/text/Anchor.java | 1 | 2 | 230 | 88 | -- | 0 | UM |
/core/com/lowagie/text/pdf/PageResources.java | 1 | 2 | 253 | 76 | -- | 2 | UM |
/core/com/lowagie/text/Annotation.java | 1 | 2 | 373 | 12 | -- | 1 | UM |
/core/com/lowagie/text/pdf/FontDetails.java | 1 | 2 | 310 | 172 | -- | 1 | UM |
/core/com/lowagie/text/html/SAXmyHtmlHandler.java | 1 | 2 | 275 | 224 | -- | 0 | UM |
/core/com/lowagie/text/pdf/IntHashtable.java | 1 | 2 | 480 | 28 | -- | 1 | UM |
/core/com/lowagie/text/pdf/hyphenation/SimplePatternParser.java | 1 | 2 | 408 | 104 | -- | 1 | UM |
/core/com/lowagie/text/pdf/Type3Font.java | 1 | 2 | 368 | 172 | -- | 1 | UM |
/core/com/lowagie/text/pdf/hyphenation/HyphenationTree.java | 1 | 2 | 498 | 148 | -- | 1 | UM |
/core/com/lowagie/text/SimpleTable.java | 1 | 2 | 466 | 274 | -- | 1 | UM |
/core/com/lowagie/text/pdf/BaseField.java | 1 | 2 | 784 | 66 | -- | 1 | UM |
/core/com/lowagie/text/pdf/codec/CCITTG4Encoder.java | 1 | 2 | 948 | 116 | -- | 0 | UM |
/core/com/lowagie/text/pdf/PdfName.java | 1 | 2 | 1229 | 98 | -- | 1 | UM |
/core/com/lowagie/text/pdf/CFFFont.java | 1 | 2 | 1541 | 474 | -- | 0 | UM |
/core/com/lowagie/text/pdf/codec/TIFFFaxDecoder.java | 1 | 2 | 1862 | 456 | -- | 0 | UM |
/core/com/lowagie/text/pdf/PdfStructureTreeRoot.java | 1 | 3 | 126 | 69 | -- | 1 | UM |
/core/com/lowagie/text/html/simpleparser/IncTable.java | 1 | 3 | 141 | 72 | -- | 3 | UM |
/core/com/lowagie/text/html/simpleparser/ChainedProperties.java | 1 | 3 | 160 | 54 | -- | 1 | UM |
/core/com/lowagie/text/pdf/PdfLister.java | 1 | 3 | 176 | 89 | -- | 0 | UM |
/core/com/lowagie/text/pdf/PdfSmartCopy.java | 1 | 3 | 270 | 92 | -- | 1 | UM |
/core/com/lowagie/text/pdf/PdfOutline.java | 1 | 3 | 367 | 44 | -- | 1 | UM |
/core/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java | 1 | 3 | 368 | 86 | -- | 1 | UM |
/core/com/lowagie/text/pdf/internal/PdfAnnotationsImp.java | 1 | 3 | 320 | 151 | -- | 2 | UM |
/core/com/lowagie/text/pdf/PdfPageLabels.java | 1 | 3 | 320 | 192 | -- | 1 | UM |
/core/com/lowagie/text/pdf/codec/wmf/MetaState.java | 1 | 3 | 494 | 152 | -- | 2 | UM |
/core/com/lowagie/text/pdf/BarcodeCodabar.java | 1 | 3 | 426 | 262 | -- | 0 | UM |
/core/com/lowagie/text/SimpleCell.java | 1 | 3 | 599 | 146 | -- | 1 | UM |
/core/com/lowagie/text/pdf/TextField.java | 1 | 3 | 982 | 64 | -- | 1 | UM |
/core/com/lowagie/text/xml/simpleparser/SimpleXMLParser.java | 1 | 3 | 1012 | 34 | -- | 2 | UM |
/core/com/lowagie/text/pdf/PdfAnnotation.java | 1 | 3 | 1001 | 68 | -- | 2 | UM |
/core/com/lowagie/text/pdf/codec/GifImage.java | 1 | 3 | 810 | 266 | -- | 1 | UM |
/core/com/lowagie/text/pdf/CJKFont.java | 1 | 3 | 978 | 200 | -- | 3 | UM |
/core/com/lowagie/text/pdf/PdfChunk.java | 1 | 3 | 930 | 390 | -- | 4 | UM |
/core/com/lowagie/text/Image.java | 1 | 3 | 1811 | 86 | -- | 0 | UM |
/core/com/lowagie/text/pdf/PdfSignatureAppearance.java | 1 | 3 | 1837 | 242 | -- | 1 | UM |
/core/com/lowagie/text/pdf/BarcodePDF417.java | 1 | 3 | 2622 | 84 | -- | 1 | UM |
/core/com/lowagie/text/pdf/events/IndexEvents.java | 1 | 4 | 300 | 62 | -- | 5 | UM |
/core/com/lowagie/text/pdf/PdfReaderInstance.java | 1 | 4 | 235 | 157 | -- | 3 | UM |
/core/com/lowagie/text/pdf/DefaultFontMapper.java | 1 | 4 | 348 | 70 | -- | 2 | UM |
/core/com/lowagie/text/pdf/PdfPages.java | 1 | 4 | 250 | 188 | -- | 2 | UM |
/core/com/lowagie/text/pdf/VerticalText.java | 1 | 4 | 330 | 108 | -- | 1 | UM |
/core/com/lowagie/text/List.java | 1 | 4 | 437 | 74 | -- | 1 | UM |
/core/com/lowagie/text/Section.java | 1 | 4 | 592 | 94 | -- | 1 | UM |
/core/com/lowagie/text/pdf/MultiColumnText.java | 1 | 4 | 564 | 168 | -- | 1 | UM |
/core/com/lowagie/text/pdf/TrueTypeFontUnicode.java | 1 | 4 | 673 | 282 | -- | 1 | UM |
/core/com/lowagie/text/pdf/BidiOrder.java | 1 | 4 | 1372 | 142 | -- | 0 | UM |
/core/com/lowagie/text/xml/SAXiTextHandler.java | 1 | 4 | 1145 | 864 | -- | 2 | UM |
/core/com/lowagie/text/pdf/codec/BmpImage.java | 1 | 4 | 1850 | 174 | -- | 1 | UM |
/core/com/lowagie/text/pdf/CFFFontSubset.java | 1 | 4 | 1827 | 366 | -- | 10 | UM |
/core/com/lowagie/text/html/HtmlWriter.java | 1 | 4 | 1546 | 896 | -- | 1 | UM |
/core/com/lowagie/text/pdf/XfdfReader.java | 1 | 5 | 190 | 74 | -- | 3 | UM |
/core/com/lowagie/text/pdf/PdfDictionary.java | 1 | 5 | 320 | 72 | -- | 1 | UM |
/core/com/lowagie/text/pdf/FdfReader.java | 1 | 5 | 240 | 156 | -- | 1 | UM |
/core/com/lowagie/text/pdf/PdfTable.java | 1 | 5 | 260 | 172 | -- | 2 | UM |
/core/com/lowagie/text/Chunk.java | 1 | 5 | 512 | 73 | -- | 1 | UM |
/core/com/lowagie/text/Phrase.java | 1 | 5 | 534 | 134 | -- | 0 | UM |
/core/com/lowagie/text/pdf/Type1Font.java | 1 | 5 | 1144 | 452 | -- | 2 | UM |
/core/com/lowagie/text/pdf/PdfFormField.java | 1 | 6 | 494 | 84 | -- | 1 | UM |
/core/com/lowagie/text/pdf/SimpleNamedDestination.java | 1 | 6 | 452 | 147 | -- | 2 | UM |
/core/com/lowagie/text/pdf/FdfWriter.java | 1 | 6 | 421 | 248 | -- | 1 | UM |
/core/com/lowagie/text/pdf/BidiLine.java | 1 | 6 | 1606 | 492 | -- | 1 | UM |
/core/com/lowagie/text/pdf/ColumnText.java | 1 | 6 | 1941 | 942 | -- | 3 | UM |
/core/com/lowagie/text/pdf/PRAcroForm.java | 1 | 7 | 207 | 143 | -- | 3 | UM |
/core/com/lowagie/text/Cell.java | 1 | 7 | 787 | 292 | -- | 1 | UM |
/core/com/lowagie/text/pdf/TrueTypeFontSubSet.java | 1 | 7 | 653 | 430 | -- | 3 | UM |
/core/com/lowagie/text/pdf/codec/TIFFDirectory.java | 1 | 7 | 772 | 322 | -- | 1 | UM |
/core/com/lowagie/text/FontFactoryImp.java | 1 | 7 | 751 | 537 | -- | 2 | UM |
/core/com/lowagie/text/pdf/SimpleBookmark.java | 1 | 7 | 1097 | 362 | -- | 2 | UM |
/core/com/lowagie/text/pdf/PdfCell.java | 1 | 7 | 976 | 491 | -- | 2 | UM |
/core/com/lowagie/text/html/simpleparser/HTMLWorker.java | 1 | 7 | 1118 | 498 | -- | 5 | UM |
/core/com/lowagie/text/pdf/hyphenation/TernaryTree.java | 1 | 8 | 806 | 204 | -- | 2 | UM |
/core/com/lowagie/text/pdf/PdfArray.java | 1 | 9 | 294 | 108 | -- | 1 | UM |
/core/com/lowagie/text/pdf/PdfContentByte.java | 1 | 9 | 3162 | 594 | -- | 3 | UM |
/core/com/lowagie/text/pdf/PdfLine.java | 1 | 10 | 432 | 220 | -- | 1 | UM |
/core/com/lowagie/text/pdf/PdfCopy.java | 1 | 10 | 1092 | 482 | -- | 3 | UM |
/core/com/lowagie/text/pdf/PdfEncodings.java | 1 | 10 | 1262 | 464 | -- | 2 | UM |
/core/com/lowagie/text/pdf/events/PdfPageEventForwarder.java | 1 | 11 | 169 | 142 | -- | 1 | UM |
/core/com/lowagie/text/pdf/BaseFont.java | 1 | 11 | 1227 | 396 | -- | 3 | UM |
/core/com/lowagie/text/pdf/DocumentFont.java | 1 | 11 | 986 | 657 | -- | 1 | UM |
/core/com/lowagie/text/Table.java | 1 | 12 | 1460 | 666 | -- | 1 | UM |
/core/com/lowagie/text/pdf/PdfPKCS7.java | 1 | 12 | 1593 | 744 | -- | 4 | UM |
/core/com/lowagie/text/Document.java | 1 | 13 | 603 | 256 | -- | 2 | UM |
/core/com/lowagie/text/pdf/PdfPTable.java | 1 | 13 | 1139 | 328 | -- | 1 | UM |
/core/com/lowagie/text/pdf/PdfCopyFieldsImp.java | 1 | 13 | 1071 | 535 | -- | 13 | UM |
/core/com/lowagie/text/pdf/PdfGraphics2D.java | 1 | 16 | 2316 | 1021 | -- | 2 | UM |
/core/com/lowagie/text/pdf/PdfStamperImp.java | 1 | 16 | 2463 | 1370 | -- | 5 | UM |
/core/com/lowagie/text/pdf/XfaForm.java | 1 | 17 | 1258 | 492 | -- | 7 | UM |
/core/com/lowagie/text/pdf/PdfDocument.java | 1 | 18 | 3935 | 1560 | -- | 8 | UM |
/core/com/lowagie/text/pdf/TrueTypeFont.java | 1 | 20 | 2139 | 1352 | -- | 3 | UM |
/core/com/lowagie/text/pdf/PdfReader.java | 1 | 34 | 5381 | 2478 | -- | 5 | UM |
/core/com/lowagie/text/pdf/AcroFields.java | 1 | 35 | 3158 | 2602 | -- | 14 | UM |