Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-02-10Take advantage of multiple type catch of Java 7Philip Langer4-19/+7
2016-09-12Add support for additive mergeLaurent Delaigue1-0/+10
2016-06-15Switch to Eclipse mars.2Mathieu Cartaud5-29/+30
2016-02-01Scalable conflict detectorMathieu Cartaud1-3/+3
2014-03-13normalize EOLs in the core (first pass)Laurent Goubet18-1761/+1761
2014-03-10Add WeightProvider RegistryAxel Richard3-6/+9
2014-01-30Cleanup for version bumpingLaurent Goubet6-19/+14
2013-04-18[381143] Do not nest containment deletion conflicts.Laurent Goubet3-0/+255
2012-10-15add Monitor to all computing methods.Mikaël Barbero2-14/+19
2012-10-12Merge branch 'master' into api_embellishmentMikaël Barbero2-8/+2
2012-10-11bug 390664: ignore XMI id option does not fully ignore ids cbrun2-4/+2
2012-10-09use a EObject to URI cache with max size instead of weakKeysMikaël Barbero2-2/+4
2012-10-05set the EObject to URI cache to use weak keysMikaël Barbero2-2/+2
2012-10-04API embellishmentMikaël Barbero2-4/+8
2012-09-26Renaming AbstractInputData#loadFromClassLoader (typo).lgoubet1-7/+48
2012-09-18keep resource sets.Cedric Notot1-0/+7
2012-09-06Updating the API to launch comparison to a new paradigmlgoubet2-6/+22
2012-08-03add a EMFCompareConfiguration class to configure the match/diff/mergeMikaël Barbero2-2/+4
2012-06-01Boyscout : removing warningslgoubet1-0/+1
2012-06-01A few APIs changes :cbrun1-1/+1
2012-05-03Commiting all of the models corresponding to the conflict use cases.lgoubet2-269/+293
2012-04-13Promoting the EMFComparePredicates to API, refactoring the tests to movelgoubet2-641/+187
2012-04-11We were missing one of the described changes in the mock models.lgoubet1-31/+206
2012-04-04Fixing id issue in the test modelslgoubet2-11/+67
2012-04-03First implementation of a Predicates-based diff testing.lgoubet2-1/+431
2012-04-02Drafting the DiffTest implementationlgoubet12-55/+278
2012-04-02Reorganizing the junit framework packages.lgoubet12-91/+225
2012-03-28Drafting the future "testing" framework of EMF Comparelgoubet12-0/+848
2012-03-12Move all features and plugins that will be deprecated by the incoming restruc...lgoubet7-1072/+0
2012-03-05Adding 2012 to EMF Compare's copyright noticeslgoubet7-7/+7
2012-01-30Setting up a new framework to ease the addition of new unit testslgoubet7-0/+1072

    Back to the top