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
/fw/src/net/sourceforge/squirrel_sql/fw/sql/DatabaseObjectInfo.java438120--0SM
/plugins/derby/src/net/sourceforge/squirrel_sql/plugins/derby/DerbyPlugin.java3223024--0SM
/fw/src/net/sourceforge/squirrel_sql/fw/sql/SQLDatabaseMetaData.java329155--0SM
/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/tokenizer/OracleQueryTokenizer.java2134629--1SM
/app/src/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfo.java212843--0SM
/app/src/net/sourceforge/squirrel_sql/client/preferences/GeneralPreferencesPanel.java213523--0SM
/app/src/net/sourceforge/squirrel_sql/client/session/FileManager.java21182--0SM
/app/src/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferences.java20340--0SM
/fw/src/net/sourceforge/squirrel_sql/fw/util/Utilities.java10520--0SM
/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/prefs/OraclePreferenceBean.java10280--0SM
/app/src/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java10100--0SM
/app/src/net/sourceforge/squirrel_sql/client/Version.java1070--0SM
/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreePanel.java1020--0SM
/fw/src/net/sourceforge/squirrel_sql/fw/sql/ResultSetReader.java22337262--0SM
/fw/src/net/sourceforge/squirrel_sql/fw/dialects/DialectUtils.java11785238--0SM
/plugins/dbcopy/src/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPlugin.java113217--0SM
/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring/commands/ModifyColumnCommand.java1127618--0SM
/app/src/net/sourceforge/squirrel_sql/client/preferences/SquirrelPreferencesBeanInfo.java1118687--0SM
/fw/src/net/sourceforge/squirrel_sql/fw/dialects/SQLServerDialect.java1121428--0SM
/app/src/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java117028--0SM
/app/src/net/sourceforge/squirrel_sql/client/gui/db/DriverInternalFrame.java111616--0SM
/app/src/net/sourceforge/squirrel_sql/client/gui/session/SessionInternalFrame.java111515--0SM
/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeInteger.java111212--0SM
/test/adhoc/test/MyH2Trigger.java111110--0SM
/plugins/sybase/src/net/sourceforge/squirrel_sql/plugins/SybaseASE/SybaseASEPlugin.java1122--0SM
/plugins/mssql/src/net/sourceforge/squirrel_sql/plugins/mssql/MssqlPlugin.java1122--0SM
/plugins/dataimport/src/net/sourceforge/squirrel_sql/plugins/dataimport/DataImportPlugin.java1122--0SM
/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java1122--0SM
/test/src/net/sourceforge/squirrel_sql/plugins/oracle/tokenizer/OracleQueryTokenizerTest.java122322--0UM
/app/src/net/sourceforge/squirrel_sql/client/session/action/DeleteTablesCommand.java12123111--0UM
/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/prefs/OraclePluginPreferencesPanel.java146484--4UM
/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/OraclePlugin.java141030138--0UM
/fw/src/net/sourceforge/squirrel_sql/fw/sql/SQLConnection.java356579--0UM
/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring/DBUtil.java17196101--0UM
/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table/ContentsTab.java567450--0UM