?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: e4f7d8e) | patch
[434828] Test Merge Conflict Diff With Conflicting Diff With RequiredBy79/27079/4
commit7330d41bbbae5652617243162984f2b2f807ef3b
authorArthur Daussy <arthur.daussy@obeo.fr>
Thu, 22 May 2014 07:12:03 +0000 (22 09:12 +0200)
committerAxel Richard <axel.richard@obeo.fr>
Wed, 28 May 2014 08:27:32 +0000 (28 10:27 +0200)
treebcf4004cb00c03d4512b4bdcdc0247a1c511f45etree | snapshot (tar.gz zip)
parente4f7d8ea83b77a673070b1c776d9ff4affc8f383commit | diff
[434828] Test Merge Conflict Diff With Conflicting Diff With RequiredBy

Bug: 434828
Change-Id: I9c396f45554deae7701e1a1b1284ecb865b2d34c
Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
Also-by: Axel Richard <axel.richard@obeo.fr>
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/TestBug434828.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/data/_434828/left.nodes [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/data/_434828/origin.nodes [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/data/_434828/right.nodes [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/suite/BugsTestSuite.java diff | blob | blame | history
Eclipse foundation framework to comapre EMF models