Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2019-02-26Bump versions for 3.3.6 for 2019-033.3.6M33.3.6lgoubet24-27/+27
2019-02-26patch ModelGitMergeEditorInput for EGit 5.3.0 compatibilitylgoubet1-31/+32
2019-02-26Suppress guava nested concatenationslgoubet1-10/+6
2019-02-25Opened EMF Compare APIWilliam Piers3-5/+26
2019-02-11Remove accidental use of Guavalgoubet1-2/+1
2019-02-11SWTException when switching comparisons in a compare dialoglgoubet6-17/+52
2019-02-11Allow clients to provide pre-computed comparisons to the compare UIlgoubet2-9/+43
2019-01-09[543292] Make GitTestSupport compatible with EGit 5.2Philip Langer3-4/+8
2018-12-11[527567] Provide support for a general property merge viewer3.3.5Philip Langer21-4/+3040
2018-12-11[514079] Improve mirroring supportPhilip Langer44-1240/+1459
2018-12-04Ignore failing git tests for nowlgoubet3-0/+13
2018-12-03Bump versions to 3.3.5lgoubet24-27/+27
2018-12-03Use a released version of Siriuslgoubet2-2/+2
2018-11-30[541730] Reverts d59c924 due to an UI freezelgoubet1-4/+0
2018-08-16Fix bundle meta-dataPhilip Langer10-18/+38
2018-06-22bump feature versions3.3.4M13.3.4lgoubet26-29/+29
2018-06-22bump versionslgoubet24-24/+24
2018-06-22Extension point to provide specific matching rules for equality helperStéphane Thibaudeau14-19/+908
2018-06-22Remove useless and mysterious codeStéphane Thibaudeau1-11/+0
2018-06-22EMF Compare is compatible with JGit 5.* versionsStéphane Thibaudeau1-1/+1
2018-06-22Add explicit dependency to org.eclipse.gefStéphane Thibaudeau1-1/+2
2018-06-22Do not minimize identical resources when Xtext is usedStéphane Thibaudeau1-53/+95
2018-06-22Use white-list strategy to retrieve the Model providerStéphane Thibaudeau4-41/+29
2018-06-22Better handling of Xtext with Live scope optionStéphane Thibaudeau3-3/+8
2018-06-22EMF Compare is no longer compatible with egit < 4.2lgoubet5-11/+11
2018-06-05Introduce test for merges with multiple ancestorslgoubet9-1/+142
2018-06-04[534365] Fix RecursiveModelMerger for "binary" git attributesArthur Daussy1-2/+7
2018-06-04Do not handle "merged" files twice when JGit stages themArthur Daussy1-5/+23
2018-06-04[535200] Create a new TreeWalk instead reusing oneArthur Daussy4-121/+267
2018-05-16Fix JGit dependency version range3.3.3M7b3.3.3Laurent Delaigue1-1/+1
2018-05-03Improve performance of DiffUtil3.3.3M7Philip Langer1-83/+233
2018-05-03Improve performance of ComparisionUtilPhilip Langer1-42/+40
2018-05-03Improve performance of equality helperPhilip Langer2-62/+79
2018-05-01[525473] [Papyrus] Connections disappear when comparing multiple diagramsChristian W. Damus1-1/+10
2018-05-01Avoid visiting elements multiple times in Graph.ParentsIteratorPhilip Langer1-2/+18
2018-05-01[525286] [Papyrus] Diffs in invisible stereotype property visualizations not ...Christian W. Damus1-3/+8
2018-05-01[521940] Prevent index out of bounds exception on empty SMV treePhilip Langer1-18/+37
2018-05-01SWTUtil.safeRedraw should check for disposed controlPhilip Langer1-2/+5
2018-05-01[527567] Generalize the table and tree merge viewer frameworkPhilip Langer9-245/+538
2018-05-01[529882] Synchronize zoom levels and allow changing it in diagram CMVCamille Letavernier1-2/+96
2018-05-01Improve performance of the merging processPhilip Langer5-128/+519
2018-05-01Improve performance of IDiffRelationshipComputer implementationsPhilip Langer5-274/+246
2018-05-01Improve performance of AbstractCopyCommand.getChangedDiffsPhilip Langer1-6/+6
2018-05-01[527864] Prevent CMV lines to be broken after merging an add/delete diffPhilip Langer1-3/+5
2018-05-01[527858] Selecting a diff with conflicts failsPhilip Langer2-7/+48
2018-05-01[527567] DiagramCompareItemProviderAdapterFactory should be a decoratorPhilip Langer4-85/+128
2018-05-01[508526] Improve text comparePhilip Langer14-546/+1908
2018-05-01The show merge consequences control is confusing when disabledPhilip Langer6-60/+111
2018-05-01EMFCompareStructureMergeViewer does much redundant work changing inputPhilip Langer2-29/+81
2018-05-01Support key bindings for commonly used merge/navigate actionsPhilip Langer3-6/+216

Back to the top