Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AttributeChangeMerger.java
AgeCommit message (Expand)AuthorFilesLines
2016-07-12Do not consider a container deletion to conflict with unsets under itLaurent Goubet1-1/+7
2016-06-15Switch to Eclipse mars.2Mathieu Cartaud1-2/+4
2015-05-05Fix some of the warnings3.1.0M7Laurent Goubet1-0/+1
2015-03-02[458147] Apply three-way merging also for rejecting attribute changesPhilip Langer1-83/+240
2014-12-07[451365] Adds specific handling of opaque action, behavior & expressionPhilip Langer1-1/+17
2014-10-27[446947] Adds support for three-way merging multi-line String attributesPhilip Langer1-0/+74
2014-03-13normalize EOLs in the core (second pass)Laurent Goubet1-411/+411
2014-02-17[418163] Manage display and merge of UML Stereotype PropertiesAxel Richard1-2/+16
2014-02-17[418163] Use safe version of eGet and eSet in MergersAxel Richard1-11/+12
2013-07-16Refactoring of the mergersMikaël Barbero1-122/+42
2013-06-21Filling of the implication link with UML subsets.Cedric Notot1-1/+1
2013-04-19unused method is now deprecated.Laurent Goubet1-0/+2
2013-02-11[400221] More extensible mergers... and use extensions for requirementsLaurent Goubet1-0/+474

    Back to the top