Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-01-05[484576] Fix bug on pseudo-conflict computationLaurent Delaigue7-2/+108
2016-01-05[484577] Make sure 'requires' are on the same sideLaurent Delaigue19-57/+136
2016-01-05Remove dangerous & useless Post-ProcessorLaurent Delaigue7-494/+16
2015-12-24Add experimental support for Sirius diagram comparisoncbrun56-4/+2746
2015-12-24[471157] StackOverflow in ThreeWayComparisonGroupProviderAxel Richard1-4/+18
2015-12-17[484543] NPE in EMFCompareContentMergeViewerLaurent Delaigue1-1/+3
2015-12-17[484542] NPE in ReferenceChangeTooltipProviderLaurent Delaigue2-3/+6
2015-12-11Fix performance tests, again3.2.0M4Laurent Delaigue1-14/+6
2015-12-11Fix performance testsLaurent Delaigue1-4/+12
2015-12-10Fix warnings in ModelGitMergeEditorInputLaurent Delaigue1-7/+9
2015-12-09Fix more RCPTT testsLaurent Delaigue2-1/+3
2015-12-08Fix bug in "Replace with Local History"Laurent Delaigue5-71/+71
2015-12-04[482404] Support coordinate changes for movable labels in GMF diagramsPhilip Langer9-7/+218
2015-12-04Make documentation less ambiguousAxel Richard2-7/+9
2015-12-04[479449] Raise conflict for addition to single-valued containment refPhilip Langer6-10/+164
2015-12-03[480388] Avoid recursion when loading packages or profiles.Laurent Goubet1-14/+22
2015-12-03[480395] Avoid calling EcoreUtil.getURI() as much as possible.Laurent Goubet1-9/+9
2015-11-04[475935] Fix potential IllegalStateException in MergeViewerItemMathieu Cartaud1-1/+1
2015-10-28Revert "[462863] Staging Prompt after Resolving Conflicts"3.2.0M3Axel Richard9-488/+12
2015-10-27Revert "[480437] Missing Diff in diagram conflict delete vs coordinateAxel Richard26-943/+10
2015-10-27[473190] Fix NPE in the CompareStructureMergeViewer - rcptt testsMathieu Cartaud5-0/+929
2015-10-27[480437] Missing Diff in diagram conflict delete vs coordinate changeAxel Richard26-10/+943
2015-10-27[462863] Staging Prompt after Resolving ConflictsMichael Borkowski9-12/+488
2015-10-26[473997] wrong logical model proxy resolutionLaurent Delaigue15-573/+1615
2015-10-23[476295] Add test casesPhilip Langer33-1/+614
2015-10-23Add additional test case with unrelated file that is deletedPhilip Langer17-7/+1272
2015-10-23[475890] Add AbstractGitMergeTestCase and test case for 475890Philip Langer16-6/+1840
2015-10-23Add means to also stage deleted files before committingPhilip Langer1-0/+58
2015-10-22[475586] Reject sub-diffs of rejected diffs when cascading filter is onAxel Richard7-29/+358
2015-10-22[478539] Refining conflicted diff doesn't show sub-diffs.Axel Richard14-2/+403
2015-10-22Revert [462863] Staging Prompt after Resolving ConflictsAxel Richard6-318/+2
2015-10-21[475586] Reject sub-diffs of rejected diffs when cascading filter is onAxel Richard2-2/+17
2015-10-21[475586] Reject sub-diffs of rejected diffs when cascading filter is onAxel Richard2-19/+9
2015-10-21Add SWTBot to Mars Logical target platformsAxel Richard5-2/+25
2015-10-21Happy checkstylePhilip Langer2-2/+2
2015-10-20[UI tests] Fix papyrus RCPTT testsMathieu Cartaud4-9/+39
2015-10-20[UI tests] Fix papyrus RCPTT testsMathieu Cartaud16-47/+82
2015-10-19[UI tests] Add tests involving Papyrus & EgitMathieu Cartaud41-7/+10606
2015-10-19[475586] Reject sub-diffs of rejected diffs when cascading filter is onAxel Richard16-89/+441
2015-10-16[462863] Staging Prompt after Resolving ConflictsMichael Borkowski6-2/+318
2015-10-15Extract EMFCompareConfiguration from EMFCompareRCPUIPluginMathieu Cartaud64-602/+1084
2015-10-15[462863] UI Messages for EGit bundleMichael Borkowski1-1/+5
2015-10-13[477769] Papyrus linked ResourceAttachmentChangesMathieu Cartaud25-72/+707
2015-10-12Fix bugs caused by an EGit updateMathieu Cartaud3-6/+6
2015-10-08[UI Tests] Upodate tests after Implementation of contextual tooltipsAxel Richard14-93/+71
2015-10-05[474030] Fix SWTException when CompareDialog is canceledStefan Dirix1-27/+30
2015-10-05[478620] Cherry pick operation hangsAlexandra Buzila3-88/+156
2015-10-01Happy checkstyle in public packages of emf.compare.ide.uiPhilip Langer3-16/+29
2015-10-01Happy checkstyleAxel Richard1-0/+3
2015-10-01Implementation of contextual tooltipsMathieu Cartaud111-182/+6210

Back to the top