?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: 7c8ace0) | patch
[458147] Apply three-way merging also for rejecting attribute changes27/42927/2
commitf0c2a00b8f9408b6b0a308938cf050cb94652193
authorPhilip Langer <planger@eclipsesource.com>
Fri, 27 Feb 2015 18:28:47 +0000 (27 19:28 +0100)
committerAxel RICHARD <axel.richard@obeo.fr>
Mon, 2 Mar 2015 15:12:16 +0000 (2 10:12 -0500)
tree0b3cc00b94b253a4627e4eaea17c6259cf972432tree | snapshot (tar.gz zip)
parent7c8ace018f7e954bf9d17c743ad74210c6b3b6a1commit | diff
[458147] Apply three-way merging also for rejecting attribute changes

Bug: 458147
Change-Id: I7ca592c1de713f99157e19593d05fd4e71775d80
Signed-off-by: Philip Langer <planger@eclipsesource.com>
plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MultiLineAttributeMergeTest.java diff | blob | blame | history
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AttributeChangeMerger.java diff | blob | blame | history
Eclipse foundation framework to comapre EMF models