commit	3298ca666c24c9a77a47ff092c3c11a3f551dfc4	[log] [tgz]
author	Philip Langer <planger@eclipsesource.com>	Thu Oct 05 11:16:12 2017 +0200
committer	Philip Langer <planger@eclipsesource.com>	Thu Oct 05 11:29:24 2017 +0200
tree	3648f488e200de62d2879c7001391c1424eb7b83
parent	7432a561f6902fcd258411654ee78fb0347f4fd4 [diff]

Bug 515373 - Add MergeResolutionManagerTest

This commit migrates the changes of
https://git.eclipse.org/r/#/c/59322/ to Papyrus Compare.

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

plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/META-INF/MANIFEST.MF[diff]
plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/mergeresolution/MergeResolutionManagerTest.java[Added - diff]
plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/suite/PapyrusGitTests.java[diff]

3 files changed

tree: 3648f488e200de62d2879c7001391c1424eb7b83

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/)