commit	b9a3e01f163c270d3692810216115a82156dad62	[log] [tgz]
author	Philip Langer <planger@eclipsesource.com>	Wed Aug 16 17:58:28 2017 +0200
committer	Philip Langer <planger@eclipsesource.com>	Thu Oct 05 10:19:07 2017 +0200
tree	4a87b6cacdc5d75443262dcd5fe0fd17da6236af
parent	46a95b93616e23602119f4698673534663f569fb [diff]

Bug 515373 - Move Papyrus-specific plugins to Papyrus project

Moves all Papyrus-specific plug-ins from EMF Compare (commit d7fb5216c)
to Papyrus Collaborative Modeling.

Change-Id: I11dd1170367a0ebdb58057e7cf9a49f5938db211
Signed-off-by: Philip Langer <planger@eclipsesource.com>

plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/.classpath[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/.project[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/.settings/org.eclipse.core.resources.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/.settings/org.eclipse.core.runtime.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/.settings/org.eclipse.jdt.core.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/.settings/org.eclipse.jdt.ui.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/.settings/org.eclipse.pde.api.tools.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/META-INF/MANIFEST.MF[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/about.html[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/about.ini[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/about.properties[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/build.properties[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/modeling32.png[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/plugin.properties[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/plugin.xml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/pom.xml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/comparesource/EMFCompareSourceAdapterFactory.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/comparesource/PapyrusFileEMFCompareSourceAdapter.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/contentmergeviewer/PapyrusTreeContentMergeViewer.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/contentmergeviewer/PapyrusTreeContentMergeViewer.properties[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/contentmergeviewer/PapyrusTreeContentMergeViewerCreator.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/contentmergeviewer/facet/FacetUtil.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/contentmergeviewer/facet/PapyrusFacetContentProviderWrapper.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/contentmergeviewer/facet/PapyrusFacetContentProviderWrapperAdapterFactory.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/contentmergeviewer/provider/PapyrusCompareAccessorMergeViewerItemProvider.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/contentmergeviewer/provider/PapyrusContextTester.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/contentmergeviewer/provider/PapyrusMergeViewerItem.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/contentmergeviewer/provider/PapyrusMergeViewerItemContentProvider.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/contentmergeviewer/provider/PapyrusTreeContentMergeViewerItemLabelProvider.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/dependency/PapyrusDependencyProvider.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/internal/AbstractPapyrusResourceSetHook.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/internal/CompareDiagramIDEUIPapyrusPlugin.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/internal/CompareUIPapyrusMessages.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/internal/CssInstallationHook.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/internal/ElementTypeSetConfigurationRegistryInitializingHook.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/internal/SaveParameterHook.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/internal/accessorfactory/PapyrusAccessorFactoryWrapper.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/internal/accessorfactory/PapyrusAccessorWrapper.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/internal/compare_ui_papyrus_messages.properties[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/internal/context/PapyrusContextUtil.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/internal/logical/view/PapyrusLMVHandler.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/util/ModelExtensionUtil.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/.classpath[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/.project[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/.settings/org.eclipse.jdt.core.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/.settings/org.eclipse.jdt.ui.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/META-INF/MANIFEST.MF[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/about.html[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/build.properties[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/plugin.properties[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/pom.xml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/AbstractGitTestCase.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/MoveOfDiagramConflictDetectionTest.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/data/case001.zip[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/conflicts/data/case002.zip[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/AbstractGitMergeTestCase.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/IgnoreDiFileChangesInGitMergeTest.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/ResourceAttachmentChangeAdd1GitMergeTest.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/ResourceAttachmentChangeAdd2GitMergeTest.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/ResourceAttachmentChangeDelete1GitMergeTest.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/ResourceAttachmentChangeDelete2GitMergeTest.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/StereotypeConflictTest.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/data/ignore-di-file-changes.zip[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/fixture/GitTestRepository.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/fixture/MockSystemReader.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/AdditiveMergeDiagramTests.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/AdditiveMergeDiagramInputData.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test1/commit1/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test1/commit1/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test1/commit1/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test1/commit2/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test1/commit2/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test1/commit2/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test1/commit3/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test1/commit3/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test1/commit3/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test1/result1/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test1/result1/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test1/result1/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test1/result2/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test1/result2/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test1/result2/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test2/commit1/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test2/commit1/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test2/commit1/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test2/commit2/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test2/commit2/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test2/commit2/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test2/commit3/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test2/commit3/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test2/commit3/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test2/result/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test2/result/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test2/result/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/commit1/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/commit1/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/commit1/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/commit1/wave.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/commit1/wave.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/commit1/wave.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/commit1/wired.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/commit1/wired.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/commit1/wired.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/commit2/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/commit2/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/commit2/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/commit2/wave.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/commit2/wave.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/commit2/wave.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/commit3/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/commit3/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/commit3/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/commit3/wired.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/commit3/wired.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/commit3/wired.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/result/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/result/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/result/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/result/wave.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/result/wave.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/result/wave.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/result/wired.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/result/wired.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/control/result/wired.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/noConflicts/commit1/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/noConflicts/commit1/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/noConflicts/commit1/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/noConflicts/commit2/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/noConflicts/commit2/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/noConflicts/commit2/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/noConflicts/commit3/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/noConflicts/commit3/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/noConflicts/commit3/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/noConflicts/result/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/noConflicts/result/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/noConflicts/result/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/rac.zip[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/solvable.zip[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/unsolvable.zip[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/implication/AttachmentChangeImplicationTest.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/implication/data/case001/commit1/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/implication/data/case001/commit1/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/implication/data/case001/commit1/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/implication/data/case001/commit2/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/implication/data/case001/commit2/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/implication/data/case001/commit2/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/implication/data/case002/commit1/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/implication/data/case002/commit1/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/implication/data/case002/commit1/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/implication/data/case002/commit2/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/implication/data/case002/commit2/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/implication/data/case002/commit2/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveConflictTests.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveNoConflictTests.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveOrderTests.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case001/commit1/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case001/commit1/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case001/commit1/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case001/commit2/fragment.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case001/commit2/fragment.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case001/commit2/fragment.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case001/commit2/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case001/commit2/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case001/commit2/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case001/commit3/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case001/commit3/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case001/commit3/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case002/commit1/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case002/commit1/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case002/commit1/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case002/commit2/fragment.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case002/commit2/fragment.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case002/commit2/fragment.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case002/commit2/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case002/commit2/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case002/commit2/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case002/commit3/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case002/commit3/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case002/commit3/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case003/commit1/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case003/commit1/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case003/commit1/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case003/commit2/fragment.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case003/commit2/fragment.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case003/commit2/fragment.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case003/commit2/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case003/commit2/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case003/commit2/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case003/commit3/control.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case003/commit3/control.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case003/commit3/control.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case003/commit3/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case003/commit3/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/case003/commit3/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/caseBug488089/left/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/caseBug488089/left/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/caseBug488089/left/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/caseBug488089/right/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/caseBug488089/right/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/caseBug488089/right/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/data/resourceAttachmentChangeMoveNoConflict.zip[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/suite/PapyrusGitTests.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add1/left/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add1/left/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add1/left/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add1/origin/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add1/origin/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add1/origin/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add1/right/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add1/right/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add1/right/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add2/left/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add2/left/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add2/left/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add2/left/unrelated-file.txt[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add2/origin/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add2/origin/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add2/origin/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add2/origin/unrelated-file.txt[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add2/right/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add2/right/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/add2/right/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete1/left/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete1/left/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete1/left/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete1/right/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete1/right/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete1/right/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete2/left/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete2/left/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete2/left/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete2/right/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete2/right/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/resourceattachmentchange/delete2/right/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/stereotype-changes/conflict/left/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/stereotype-changes/conflict/left/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/stereotype-changes/conflict/left/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/stereotype-changes/conflict/origin/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/stereotype-changes/conflict/origin/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/stereotype-changes/conflict/origin/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/stereotype-changes/conflict/right/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/stereotype-changes/conflict/right/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests.git/testmodels/stereotype-changes/conflict/right/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/.classpath[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/.project[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/.settings/org.eclipse.core.resources.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/.settings/org.eclipse.core.runtime.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/.settings/org.eclipse.jdt.core.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/.settings/org.eclipse.jdt.ui.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/META-INF/MANIFEST.MF[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/build.properties[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/expectedResultWithUMLRefineElement.nodes[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/plugin.properties[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/pom.xml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/AbstractTest.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/DiagramInputData.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/comparison/DiagramTooltipProviderTest.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/comparison/data/DiagramTooltipProviderInputData.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/comparison/data/ancestor.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/comparison/data/ancestor.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/comparison/data/ancestor.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/comparison/data/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/comparison/data/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/comparison/data/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/comparison/data/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/comparison/data/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/comparison/data/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/context/PapyrusContextUtilInputData.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/context/PapyrusContextUtilTest.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/context/data/ecore/left.ecore[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/context/data/ecore/right.ecore[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/context/data/papyrus/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/context/data/papyrus/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/context/data/papyrus/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/context/data/papyrus/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/context/data/papyrus/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/context/data/papyrus/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/difile/IgnoreDiFilePostProcessorTest.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/difile/data/left/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/difile/data/origin/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/difile/data/right/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/PapyrusConflictsGroupProviderTests.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/PapyrusDifferencesOrderTest.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/data/a1/expectedResult_DiagRefineOff.nodes[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/data/a1/expectedResult_DiagRefineOn.nodes[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/data/a1/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/data/a1/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/data/a1/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/data/a1/origin.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/data/a1/origin.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/data/a1/origin.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/data/a1/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/data/a1/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/data/a1/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/data/conflictsgroup/ConflictsGroupInputData.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/data/conflictsgroup/bug478539/left/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/data/conflictsgroup/bug478539/left/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/data/conflictsgroup/bug478539/left/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/data/conflictsgroup/bug478539/origin/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/data/conflictsgroup/bug478539/origin/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/data/conflictsgroup/bug478539/origin/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/data/conflictsgroup/bug478539/right/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/data/conflictsgroup/bug478539/right/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/data/conflictsgroup/bug478539/right/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/AssocMergeTest.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/EdgeMergeTest.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/NodeMergeTest.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/AssocMergeInputData.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/EdgeMergeInputData.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/NodeMergeInputData.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/c1/ancestor.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/c1/ancestor.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/c1/ancestor.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/c1/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/c1/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/c1/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/c1/package-info.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/c1/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/c1/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/c1/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/t1/ancestor.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/t1/ancestor.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/t1/ancestor.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/t1/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/t1/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/t1/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/t1/package-info.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/t1/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/t1/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/t1/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/c1/ancestor.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/c1/ancestor.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/c1/ancestor.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/c1/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/c1/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/c1/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/c1/package-info.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/c1/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/c1/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/c1/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/t1/ancestor.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/t1/ancestor.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/t1/ancestor.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/t1/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/t1/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/t1/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/t1/package-info.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/t1/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/t1/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/t1/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/a1/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/a1/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/a1/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/a1/package-info.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/a1/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/a1/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/a1/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/a2/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/a2/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/a2/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/a2/package-info.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/a2/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/a2/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/a2/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/t1/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/t1/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/t1/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/t1/package-info.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/t1/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/t1/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/t1/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a1/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a1/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a1/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a1/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a1/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a1/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a2/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a2/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a2/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a2/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a2/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a2/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a3/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a3/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a3/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a3/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a3/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a3/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a4/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a4/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a4/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a4/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a4/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a4/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a5/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a5/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a5/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a5/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a5/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a5/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a6/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a6/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a6/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a6/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a6/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a6/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a7/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a7/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a7/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a7/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a7/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/edges/a7/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a1/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a1/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a1/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a1/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a1/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a1/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a2/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a2/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a2/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a2/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a2/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a2/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a3/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a3/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a3/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a3/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a3/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a3/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a4/ancestor.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a4/ancestor.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a4/ancestor.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a4/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a4/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a4/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a4/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a4/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a4/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a5/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a5/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a5/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a5/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a5/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/nodes/a5/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/modelextension/ModelExtensionUtilTest.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/modelextension/data/customparametermodel/CustomParameterModel.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/modelextension/data/customparametermodel/customparametermodel.xml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/modelextension/data/fileextension/fileextension.xml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/modelextension/data/noparametermodel/NoParameterModel.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/modelextension/data/noparametermodel/noparametermodel.xml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/modelextension/data/nulldata/nullextension.xml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/modelextension/data/nullmodel/nullmodel.xml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/modelextension/data/nullparametermodel/NullParameterModel.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/modelextension/data/nullparametermodel/nullparametermodel.xml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/modelextension/data/runtimeexceptionmodel/RuntimeExceptionModel.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/modelextension/data/runtimeexceptionmodel/runtimeexceptionmodel.xml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/saveparameter/SaveParameterHookIntegrationTest.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/saveparameter/SaveParameterHookTest.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/saveparameter/data/a1/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/saveparameter/data/a1/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/saveparameter/data/a2/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/saveparameter/data/a2/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/saveparameter/data/a2/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/MergeNonConflictingCascadingFilterTest.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/ecore/left/left.ecore[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/ecore/origin/ancestor.ecore[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/ecore/right/right.ecore[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/suite/AllTests.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/uriattachment/URIAttachmentTest.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/uriattachment/data/URIAttachmentData.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/uriattachment/data/a1/left/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/uriattachment/data/a1/left/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/uriattachment/data/a1/left/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/uriattachment/data/a1/origin/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/uriattachment/data/a1/origin/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/uriattachment/data/a1/origin/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/uriattachment/data/a1/right/model.di[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/uriattachment/data/a1/right/model.notation[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/uriattachment/data/a1/right/model.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/util/PapyrusSaveParameterUtil.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/.classpath[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/.project[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/.settings/edu.umd.cs.findbugs.core.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/.settings/edu.umd.cs.findbugs.plugin.eclipse.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/.settings/org.eclipse.core.resources.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/.settings/org.eclipse.core.runtime.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/.settings/org.eclipse.jdt.core.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/.settings/org.eclipse.jdt.ui.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/.settings/org.eclipse.pde.api.tools.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/META-INF/MANIFEST.MF[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/about.html[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/build.properties[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/plugin.properties[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/plugin.xml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/pom.xml[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/ComparePapyrusMessages.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/compare_papyrus_messages.properties[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/internal/AbstractPapyrusDiagramDiffHandler.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/internal/CompareDiagramPapyrusPlugin.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/internal/DiffIndexer.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/internal/FeatureInstance.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/internal/IDiffHandler.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/internal/IgnoreDiFilePostProcessor.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/internal/PapyrusDiagram2WayDiffHandler.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/internal/PapyrusDiagram3WayDiffHandler.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/internal/PapyrusDiagramPostComparison.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/internal/PapyrusDiagramPostProcessor.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/internal/PapyrusResourceChangeParticipant.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/internal/SidedEObject.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/internal/SidedFeatureInstance.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/util/ModelExtensionUtil.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.edit.papyrus/.classpath[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.edit.papyrus/.project[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.edit.papyrus/.settings/org.eclipse.core.resources.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.edit.papyrus/.settings/org.eclipse.core.runtime.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.edit.papyrus/.settings/org.eclipse.jdt.core.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.edit.papyrus/.settings/org.eclipse.jdt.ui.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.edit.papyrus/.settings/org.eclipse.pde.api.tools.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.edit.papyrus/META-INF/MANIFEST.MF[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.edit.papyrus/about.html[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.edit.papyrus/build.properties[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.edit.papyrus/plugin.properties[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.edit.papyrus/plugin.xml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.edit.papyrus/pom.xml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.edit.papyrus/src/org/eclipse/emf/compare/uml2/edit/papyrus/Activator.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.edit.papyrus/src/org/eclipse/emf/compare/uml2/edit/papyrus/internal/decorator/PapyrusItemProviderAdapterFactoryDecorator.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.edit.papyrus/src/org/eclipse/emf/compare/uml2/edit/papyrus/internal/decorator/PapyrusItemProviderContextTester.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.edit.papyrus/src/org/eclipse/emf/compare/uml2/edit/papyrus/internal/decorator/PapyrusItemProviderDecorator.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/.checkstyle[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/.classpath[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/.project[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/.settings/org.eclipse.jdt.core.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/META-INF/MANIFEST.MF[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/about.html[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/build.properties[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/plugin.properties[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/pom.xml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/PapyrusMigrationUtil.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/ProfileMigrationTest.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/aab/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/aab/origin.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/aab/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/aba/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/aba/origin.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/aba/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/abb/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/abb/origin.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/abb/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/abc/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/abc/origin.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/abc/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/defaultval/aba/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/defaultval/aba/origin.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/defaultval/aba/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/origin.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/nodiff/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/nodiff/origin.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/nodiff/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/notmigrated/aab/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/notmigrated/aab/origin.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/notmigrated/aab/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/notmigrated/abb/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/notmigrated/abb/origin.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/notmigrated/abb/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/wrongformat/abb/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/wrongformat/abb/origin.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/wrongformat/abb/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/origin.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/version/aba/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/version/aba/origin.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/version/aba/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/version/abb/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/version/abb/origin.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/version/abb/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/version/aba/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/version/aba/origin.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/version/aba/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/version/abb/left.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/version/abb/origin.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/version/abb/right.uml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/suite/AllUITests.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/.classpath[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/.project[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/.settings/org.eclipse.core.resources.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/.settings/org.eclipse.core.runtime.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/.settings/org.eclipse.jdt.core.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/.settings/org.eclipse.jdt.ui.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/.settings/org.eclipse.pde.api.tools.prefs[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/META-INF/MANIFEST.MF[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/about.html[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/build.properties[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/plugin.properties[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/plugin.xml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/pom.xml[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/src/org/eclipse/emf/compare/uml2/papyrus/internal/UMLPapyrusCompareMessages.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/src/org/eclipse/emf/compare/uml2/papyrus/internal/UMLPapyrusComparePlugin.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/src/org/eclipse/emf/compare/uml2/papyrus/internal/hook/ProfileMigrationHook.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/src/org/eclipse/emf/compare/uml2/papyrus/internal/hook/migration/DelegatingInvocationHandler.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/src/org/eclipse/emf/compare/uml2/papyrus/internal/hook/migration/MissingProfileSupplier.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/src/org/eclipse/emf/compare/uml2/papyrus/internal/hook/migration/ModelSetWrapper.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/src/org/eclipse/emf/compare/uml2/papyrus/internal/hook/migration/ProfileMigrationDiagnostic.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/src/org/eclipse/emf/compare/uml2/papyrus/internal/hook/migration/ProfileNamespaceURIPatternAPI.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/src/org/eclipse/emf/compare/uml2/papyrus/internal/hook/migration/StereotypeApplicationRepair.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/src/org/eclipse/emf/compare/uml2/papyrus/internal/hook/migration/UMLLabelProviderService.java[Added - diff]
plugins/compare/org.eclipse.emf.compare.uml2.papyrus/src/org/eclipse/emf/compare/uml2/papyrus/internal/messages.properties[Added - diff]
plugins/compare/pom.xml[Added - diff]
plugins/pom.xml[diff]
releng/org.eclipse.papyrus.collaborativemodeling.configuration/pom.xml[diff]
releng/org.eclipse.papyrus.collaborativemodeling.p2/.settings/org.eclipse.core.resources.prefs[Added - diff]

669 files changed

tree: 4a87b6cacdc5d75443262dcd5fe0fd17da6236af

plugins/
releng/
tests/
.gitattributes
.gitignore
.project
CONTRIBUTING.md
pom.xml
README.MD

README.MD

Papyrus Collaborative Modeling

This is the collaborative modeling git repository

This repository is hosted at [Eclipse] (http://git.eclipse.org/c/papyrus/org.eclipse.papyrus-collaborativemodeling.git/)