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
/regress/test/net/sourceforge/pmd/RuleSetTest.java216268--0SM
/src/net/sourceforge/pmd/AbstractJavaRule.java103920--0SM
/src/net/sourceforge/pmd/ast/JavaParserVisitorAdapter.java103310--0SM
/src/net/sourceforge/pmd/cpd/cppast/CPPParserConstants.java102630--0SM
/src/net/sourceforge/pmd/ast/JavaParserTreeConstants.java102240--2SM
/src/net/sourceforge/pmd/jsp/ast/JspParserConstants.java101740--0SM
/src/net/sourceforge/pmd/ast/JavaParserVisitor.java101130--0SM
/src/net/sourceforge/pmd/cpd/cppast/TokenMgrError.java10720--0SM
/src/net/sourceforge/pmd/rules/MoreThanOneLogger.java10690--0SM
/src/net/sourceforge/pmd/ast/ASTLiteral.java10550--0SM
/src/net/sourceforge/pmd/ast/ASTCompilationUnit.java10340--0SM
/src/net/sourceforge/pmd/rules/strings/UseIndexOfChar.java10200--0SM
/src/net/sourceforge/pmd/jsp/ast/CharStream.java10150--0SM
/src/net/sourceforge/pmd/ast/CharStream.java10150--0SM
/src/net/sourceforge/pmd/RuleChainVisitor.java1070--0SM
/src/net/sourceforge/pmd/cpd/GUI.java1040--0SM
/src/net/sourceforge/pmd/PMD.java44300251--1SM
/src/net/sourceforge/pmd/cpd/cppast/ParseException.java1111342--0SM
/src/net/sourceforge/pmd/rules/strings/AvoidDuplicateLiteralsRule.java1112720--0SM
/src/net/sourceforge/pmd/rules/SuspiciousOctalEscape.java118144--0SM
/src/net/sourceforge/pmd/rules/imports/UnusedImportsRule.java11989--0SM
/src/net/sourceforge/pmd/rules/optimization/UseStringBufferForStringAppends.java115338--0SM
/src/net/sourceforge/pmd/rules/strings/UselessStringValueOf.java116421--0SM
/regress/test/net/sourceforge/pmd/rules/basic/BasicRulesTest.java114436--0SM
/src/net/sourceforge/pmd/rules/AbstractPoorMethodCall.java114824--0SM
/src/net/sourceforge/pmd/rules/design/NullAssignmentRule.java114120--0SM
/src/net/sourceforge/pmd/ast/ASTAnnotation.java113922--0SM
/src/net/sourceforge/pmd/rules/optimization/AvoidInstantiatingObjectsInLoops.java113714--0SM
/src/net/sourceforge/pmd/cpd/cppast/Token.java11394--1SM
/src/net/sourceforge/pmd/rules/strings/AppendCharacterWithChar.java111913--0SM
/regress/test/net/sourceforge/pmd/ast/JDKVersionTest.java111515--0SM
/src/net/sourceforge/pmd/RuleSets.java111810--0SM
/regress/test/net/sourceforge/pmd/SuppressWarningsTest.java111212--0SM
/src/net/sourceforge/pmd/SimpleRuleSetNameMapper.java1155--0SM
/src/net/sourceforge/pmd/util/TypeMap.java0104--0UM
/src/net/sourceforge/pmd/jsp/ast/Token.java12398--1UM
/src/net/sourceforge/pmd/ast/Token.java12498--3UM
/src/net/sourceforge/pmd/rules/UselessOperationOnImmutable.java125629--0UM
/src/net/sourceforge/pmd/AbstractRuleChainVisitor.java129257--0UM
/src/net/sourceforge/pmd/rules/design/PreserveStackTrace.java1213360--0UM
/src/net/sourceforge/pmd/rules/UselessOverridingMethod.java1218889--0UM
/src/net/sourceforge/pmd/rules/strings/ConsecutiveLiteralAppends.java1222387--0UM
/src/net/sourceforge/pmd/cpd/cppast/SimpleCharStream.java1235730--0UM
/src/net/sourceforge/pmd/RuleChain.java221820--0UM
/src/net/sourceforge/pmd/RuleSetWriter.java1329354--0UM
/src/net/sourceforge/pmd/ast/JavaParserTokenManager.java132100162--1UM
/src/net/sourceforge/pmd/ast/ParseException.java15113105--0UM
/src/net/sourceforge/pmd/jsp/ast/ParseException.java15113105--0UM
/src/net/sourceforge/pmd/jsp/ast/TokenMgrError.java167263--0UM
/src/net/sourceforge/pmd/ast/TokenMgrError.java167363--1UM
/src/net/sourceforge/pmd/jsp/ast/JJTJspParserState.java1128173--2UM
/src/net/sourceforge/pmd/cpd/cppast/CPPParserTokenManager.java12816551442--0UM
/src/net/sourceforge/pmd/ast/JavaCharStream.java131480428--0UM
/src/net/sourceforge/pmd/jsp/ast/JspParser.java1491455416--2UM
/src/net/sourceforge/pmd/jsp/ast/JspParserTokenManager.java17235173254--0UM
/src/net/sourceforge/pmd/ast/JavaParser.java130289122368--0UM