Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Brun2011-03-07 11:04:29 -0500
committerCedric Brun2011-03-07 11:04:29 -0500
commit6b98db3363e856a8ca117f2f0b9e9b747e787ff2 (patch)
tree48af7ee3c5439ba40c6e92007fd3b1cc54ee77c2 /plugins/org.eclipse.emf.compare.tests/.project
parent98ef69698643af687fd432149e0b2fad6e8711a3 (diff)
downloadorg.eclipse.emf.compare-6b98db3363e856a8ca117f2f0b9e9b747e787ff2.tar.gz
org.eclipse.emf.compare-6b98db3363e856a8ca117f2f0b9e9b747e787ff2.tar.xz
org.eclipse.emf.compare-6b98db3363e856a8ca117f2f0b9e9b747e787ff2.zip
enabling a set of JUnit tests for the merge and fix a long standing test failure on 3Way compare and merge. Now supporting the diff and merge of non unique multi-valued attributes and the corresponding merge now handle the order and dupplication gracefully.
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/.project')
-rw-r--r--plugins/org.eclipse.emf.compare.tests/.project6
1 files changed, 0 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/.project b/plugins/org.eclipse.emf.compare.tests/.project
index 69ac4b138..10615551b 100644
--- a/plugins/org.eclipse.emf.compare.tests/.project
+++ b/plugins/org.eclipse.emf.compare.tests/.project
@@ -20,15 +20,9 @@
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
- <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
</natures>
</projectDescription>

Back to the top