?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: 18f3008) | patch
[409503] Allow merging of ResourceAttachmentChanges in new resources.43/13643/1
commit0d2c2576bd5f4c6d8a3fa5612ca139d32dd4e5d5
authorLaurent Goubet <laurent.goubet@obeo.fr>
Fri, 7 Jun 2013 11:58:51 +0000 (7 13:58 +0200)
committerLaurent Goubet <laurent.goubet@obeo.fr>
Fri, 7 Jun 2013 12:57:42 +0000 (7 14:57 +0200)
tree22b8768953f836f3adc6f51818f63e150e99d8b3tree | snapshot (tar.gz zip)
parent18f300895483d76675ee99094066dd208cab0af9commit | diff
[409503] Allow merging of ResourceAttachmentChanges in new resources.

Bug: 409503
Change-Id: I97415ee866f3f38a37378fbf7a58f57d4c177814
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/ResourceAttachmentChangeMergeViewerItem.java diff | blob | blame | history
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ResourceAttachmentChangeMerger.java diff | blob | blame | history
Eclipse foundation framework to comapre EMF models