Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/IndividualDiffInputData.java
AgeCommit message (Expand)AuthorFilesLines
2019-05-23Merging single-valued containment changes can lead to dangling elements3.3.7M5lgoubet1-0/+12
2016-06-15Switch to Eclipse mars.2Mathieu Cartaud1-9/+18
2016-01-08[484579] Fix merge consequences algorithmMathieu Cartaud1-1/+25
2014-12-16[455255] Fix determination of TargetFeature in DiffUtilStefan Dirix1-1/+14
2014-12-16Adds unit test for enum3.1.0M4Arthur Daussy1-0/+48
2014-12-16[454579] Fix Nullpointer when element is moved out of FeatureMapStefan Dirix1-0/+13
2014-12-04[442897] Pseudo conflicts under Real Add conflictsAxel Richard1-0/+12
2014-07-07FeatureMaps: FeatureMapChanges testsAxel Richard1-0/+312
2014-05-23[435053] Add Pseudo conflicts tests.Axel Richard1-0/+48
2014-03-28[418472] Cannot merge a move from nestedClassifier to packagedElementAxel Richard1-1/+9
2014-03-13normalize EOLs in the core (first pass)Laurent Goubet1-336/+336
2013-09-24[416400] - Fix IOWrappedException by adding a ConflictMergerAxel Richard1-1/+97
2012-09-26Renaming AbstractInputData#loadFromClassLoader (typo).lgoubet1-54/+54
2012-08-31Some more unit tests for the out-of-scope values merging.lgoubet1-0/+36
2012-08-28Implementing the unit tests for the unsetting of mono-valued referenceslgoubet1-0/+12
2012-08-28Implementing a few more unit tests for the merging of out of scopelgoubet1-0/+12
2012-08-28Add first test for "out-of-scope values" merging, failing.lgoubet1-36/+48
2012-06-20Adding tests for all individual diffs that can be detected onlgoubet1-0/+168

    Back to the top