Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2019-09-24[releng] Update of copyrightsOlivier Constant7-7/+7
Change-Id: I5046d9d9427185c7a0203a8dc32861b873f88c43 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-09-07Bug 538800 - Upgrade version to 0.11.0Olivier Constant7-7/+7
- diffmerge.core Change-Id: I150287451def2fc22b9889edaef25d110db37b39 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-09-07Bug 535213 - Switch to EPL-2.0Olivier Constant7-28/+35
Change-Id: I3f390723a7e60d97e38cf74e5d0c6bfb03c0325c Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2017-06-09Updated copyrightsOlivier Constant7-510/+510
Change-Id: I1dd4cb74fc5dcb9ce75b981f42460d5ee17470f1 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2016-03-22Fixed SVN conflict handlingOlivier Constant3-8/+22
Change-Id: I197a0fea434c423b9183e2e341c2c3fdad042333 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2016-03-17Updated copyrights and featuresOlivier Constant7-7/+7
Change-Id: Id82bbb9cecd656ce8b348dec53b66fde6c24aab0 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2016-03-17Bug 489139 - Independence of Team integration wrt scopesOlivier Constant12-363/+497
Change-Id: I9a78adb0181cf0f8213435593741d68da2fb0f72 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2015-12-16Eclipse Team integration for DiffMergeStephane Bouchet5-0/+363
[466706] Support Local history [466427] Support Git Scm [482287] Support SVN Scm [482288] Support Perforce Scm Added support for local history, git, svn and perforce. Updated test model. Change-Id: I9b9929bbb5a74220619d4fce55b251efd18f8631 Signed-off-by: Stephane Bouchet <stephane.bouchet@intel.com> Bug: https://bugs.eclipse.org/466706

    Back to the top