Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-03-14Improve final state and MergeData when mergingLaurent Delaigue1-9/+9
2017-01-20Merge algorithm refactoringLaurent Delaigue1-9/+11
2016-06-15Switch to Eclipse mars.2Mathieu Cartaud2-40/+40
2016-05-10[492261] Merge ResourceAttChange in the right resourceMathieu Cartaud8-0/+301
2015-09-29[477767] Introduce new MatchingStrategy for models shared with git3.2.0M2Axel Richard1-3/+0
2015-09-24Manage move of empty papyrus resourcesLaurent Delaigue1-0/+3
2014-08-13Do not use assertSame for int comparisonMikaël Barbero1-128/+128
2014-03-13normalize EOLs in the core (first pass)Laurent Goubet2-1346/+1346
2014-01-30Cleanup for version bumpingLaurent Goubet1-6/+6
2013-06-19Deprecate use of EMFCompare#createDefaultScope(...)Laurent Goubet1-46/+47
2013-04-24Ignore builds failing for 406101, build against nightly EGitLaurent Goubet1-0/+5
2013-02-11[400221] More extensible mergers... and use extensions for requirementsLaurent Goubet1-33/+33
2013-01-04Resource attachment completion.Laurent Goubet6-2/+1079
2012-11-08Conflict detection for resource attachment changesLaurent Goubet1-0/+3
2012-10-04API embellishmentMikaël Barbero1-14/+14
2012-09-27Compile under Java 5lgoubet1-4/+18
2012-09-27First draft of the resource attachment change merge implementation. Thislgoubet1-0/+122
2012-09-26Renaming AbstractInputData#loadFromClassLoader (typo).lgoubet16-0/+199

    Back to the top