diff options
| author | Mikaël Barbero | 2013-04-15 06:12:21 +0000 |
|---|---|---|
| committer | Mikaël Barbero | 2013-04-15 13:30:56 +0000 |
| commit | 9ec75921959106771fd0ee243be82ff5293f5de7 (patch) | |
| tree | 9759a3289da5820f70775743785d244c4f3cede6 /plugins/org.eclipse.emf.compare.rcp | |
| parent | c3ddeb757b5ef89cdce2517bf5c81882918f6260 (diff) | |
| download | org.eclipse.emf.compare-9ec75921959106771fd0ee243be82ff5293f5de7.tar.gz org.eclipse.emf.compare-9ec75921959106771fd0ee243be82ff5293f5de7.tar.xz org.eclipse.emf.compare-9ec75921959106771fd0ee243be82ff5293f5de7.zip | |
add pseudo conflict merger
Diffstat (limited to 'plugins/org.eclipse.emf.compare.rcp')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.rcp/plugin.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.rcp/plugin.xml b/plugins/org.eclipse.emf.compare.rcp/plugin.xml index d86fe34b1..28f19c3fa 100644 --- a/plugins/org.eclipse.emf.compare.rcp/plugin.xml +++ b/plugins/org.eclipse.emf.compare.rcp/plugin.xml @@ -39,6 +39,10 @@ class="org.eclipse.emf.compare.merge.AttributeChangeMerger"
ranking="10">
</merger>
+ <merger
+ class="org.eclipse.emf.compare.merge.PseudoConflictMerger"
+ ranking="15">
+ </merger>
</extension>
<extension
point="org.eclipse.core.contenttype.contentTypes">
|