?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: fa32608) | patch
[428916] Rejecting addition with local history doesn't work38/23838/4
commit212796d34334afc71e63fd8e394c27a6dc7a19cd
authorAxel Richard <axel.richard@obeo.fr>
Mon, 24 Mar 2014 15:03:20 +0000 (24 16:03 +0100)
committerAxel Richard <axel.richard@obeo.fr>
Wed, 26 Mar 2014 08:07:05 +0000 (26 09:07 +0100)
treeec2a19f2f171e32a765af10456823cef26173982tree | snapshot (tar.gz zip)
parentfa32608c18a67e2d0c8515371bdb4a8a6952a9accommit | diff
[428916] Rejecting addition with local history doesn't work

Fix Accept/Reject Behavior + from now, a 'mark as merged' diff is not
shown (boxes) in the content merge viewers anymore.

Bug: 428916
Change-Id: Ib2cfe67abbf59b37f995d709fcedbf33c11e0e52
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/AbstractTableOrTreeMergeViewer.java diff | blob | blame | history
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/MergeMode.java diff | blob | blame | history
Eclipse foundation framework to comapre EMF models