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
/src/org/jmol/viewer/Viewer.java1614145109--0SM
/src/org/jmol/modelset/ModelCollection.java769689--0SM
/src/org/jmol/viewer/StateManager.java6510321--1SM
/src/org/jmol/util/Measure.java43323104--0SM
/src/org/jmol/g3d/Graphics3D.java43137102--0SM
/src/org/jmol/symmetry/SymmetryOperation.java52994--0SM
/src/org/jmol/shape/MeshCollection.java32108104--0SM
/src/org/jmol/viewer/StatusManager.java32229--0SM
/src/org/jmol/viewer/TransformManager.java32139--0SM
/src/org/jmol/shape/Mesh.java211512--0SM
/src/org/jmol/api/JmolViewer.java2050--0SM
/src/org/jmol/api/TriangleServer.java2010--0SM
/src/org/jmol/viewer/Token.java1010540--3SM
/src/org/jmol/util/Parser.java10260--0SM
/src/org/jmol/viewer/JmolConstants.java1020--1SM
/src/org/jmol/shapespecial/Polyhedra.java1010--0SM
/src/org/jmol/jvxl/readers/SurfaceGenerator.java1010--0SM
/src/org/jmol/adapter/readers/more/GamessReader.java444141--0SM
/src/org/jmol/g3d/Cylinder3D.java4466--0SM
/src/org/jmol/viewer/MouseManager.java22166123--0SM
/src/org/jmol/viewer/TransformManager11.java22136136--0SM
/src/org/jmol/shapespecial/Draw.java221414--0SM
/src/org/jmol/adapter/smarter/Resolver.java221313--0SM
/src/org/jmol/shape/AxesRenderer.java221111--0SM
/src/org/jmol/shape/Labels.java2255--0SM
/src/org/jmol/g3d/Sphere3D.java2244--0SM
/src/org/jmol/g3d/Text3D.java2222--0SM
/src/org/jmol/viewer/ScriptVariable.java1165927--0SM
/src/org/jmol/modelset/Atom.java112828--0SM
/src/org/jmol/shapesurface/IsosurfaceRenderer.java112626--0SM
/src/org/jmol/adapter/readers/more/GaussianReader.java112121--0SM
/src/org/jmol/adapter/smarter/AtomSetCollectionReader.java111414--0SM
/src/org/jmol/util/Escape.java111111--0SM
/src/org/jmol/g3d/Normix3D.java1194--0SM
/src/org/jmol/symmetry/SpaceGroup.java1166--0SM
/src/org/jmol/symmetry/HallInfo.java1184--0SM
/src/org/jmol/shapesurface/IsosurfaceMesh.java1166--0SM
/src/org/jmol/viewer/MouseManager14.java1164--0SM
/src/org/jmol/shapesurface/Isosurface.java1144--0SM
/src/org/jmol/shape/LabelsRenderer.java1133--0SM
/src/org/jmol/applet/Jmol.java1122--0SM
/src/org/jmol/adapter/readers/more/MOReader.java1122--0SM
/src/org/jmol/adapter/readers/more/AimsReader.java1122--0SM
/src/org/jmol/popup/PopupResourceBundle.java0000--1UM
/src/org/openscience/jmol/app/jmolpanel/JmolPanel.java1221060--0UM
/src/org/jmol/viewer/ScriptCompilationTokenParser.java13976184--0UM
/src/org/jmol/viewer/ScriptCompiler.java191814807--0UM
/src/org/jmol/viewer/ScriptMathProcessor.java191958970--0UM
/src/org/jmol/viewer/ScriptEvaluator.java131116455059--0UM