summaryrefslogtreecommitdiffstats
BranchCommit messageAuthorAge
0.1.xUpdate RelEngMatthieu Helleboid16 months
0.4.xIncreased feature+core version number to 0.4.2Olivier Constant13 months
masterMerge "[496397] [Git Connector] wrong model loaded in conflict case"Olivier Constant4 weeks
 
TagDownloadAuthorAge
v0.6.0org.eclipse.emf.diffmerge.core-0.6.0.zip  org.eclipse.emf.diffmerge.core-0.6.0.tar.gz  org.eclipse.emf.diffmerge.core-0.6.0.tar.xz  Olivier Constant2 months
v0.5.1org.eclipse.emf.diffmerge.core-0.5.1.zip  org.eclipse.emf.diffmerge.core-0.5.1.tar.gz  org.eclipse.emf.diffmerge.core-0.5.1.tar.xz  Olivier Constant9 months
v0.4.2org.eclipse.emf.diffmerge.core-0.4.2.zip  org.eclipse.emf.diffmerge.core-0.4.2.tar.gz  org.eclipse.emf.diffmerge.core-0.4.2.tar.xz  Olivier Constant13 months
v0.5.0org.eclipse.emf.diffmerge.core-0.5.0.zip  org.eclipse.emf.diffmerge.core-0.5.0.tar.gz  org.eclipse.emf.diffmerge.core-0.5.0.tar.xz  Olivier Constant14 months
v0.1.1org.eclipse.emf.diffmerge.core-0.1.1.zip  org.eclipse.emf.diffmerge.core-0.1.1.tar.gz  org.eclipse.emf.diffmerge.core-0.1.1.tar.xz  Olivier Constant16 months
v0.4.1org.eclipse.emf.diffmerge.core-0.4.1.zip  org.eclipse.emf.diffmerge.core-0.4.1.tar.gz  org.eclipse.emf.diffmerge.core-0.4.1.tar.xz  Olivier Constant16 months
v0.4.0org.eclipse.emf.diffmerge.core-0.4.0.zip  org.eclipse.emf.diffmerge.core-0.4.0.tar.gz  org.eclipse.emf.diffmerge.core-0.4.0.tar.xz  Olivier Constant21 months
v0.3.0org.eclipse.emf.diffmerge.core-0.3.0.zip  org.eclipse.emf.diffmerge.core-0.3.0.tar.gz  org.eclipse.emf.diffmerge.core-0.3.0.tar.xz  Olivier Constant2 years
v0.2.0org.eclipse.emf.diffmerge.core-0.2.0.zip  org.eclipse.emf.diffmerge.core-0.2.0.tar.gz  org.eclipse.emf.diffmerge.core-0.2.0.tar.xz  Olivier Constant3 years
v0.1.0org.eclipse.emf.diffmerge.core-0.1.0.zip  org.eclipse.emf.diffmerge.core-0.1.0.tar.gz  org.eclipse.emf.diffmerge.core-0.1.0.tar.xz  Olivier Constant4 years
 
AgeCommit messageAuthorFilesLines
2016-06-28Merge "[496397] [Git Connector] wrong model loaded in conflict case"HEADmasterOlivier Constant7-69/+145
2016-06-28[496397] [Git Connector] wrong model loaded in conflict caserefs/changes/54/75554/3Stephane Bouchet7-69/+145
2016-06-27Clean-up and renaming for 0.7.0Olivier Constant14-56/+58
2016-06-27Bug 496393 - Contributive filtering/focusing GUI mechanismrefs/changes/03/76003/2Olivier Constant31-852/+2465
2016-06-27Improved a few hashCode() implementationsOlivier Constant5-28/+54
2016-06-20Removed Perforce connectorOlivier Constant25-1803/+0
2016-05-23Build support for SCMs (attempt 2)v0.6.0Olivier Constant2-64/+54
2016-05-23Build support for SCMs (attempt 1)Olivier Constant9-653/+771
2016-05-23Added features for SCMs other than GitOlivier Constant30-0/+3115
2016-05-16Fixed regression in DiffOperation: check all atts and refs in all casesOlivier Constant1-914/+914
[...]
 
Gerrit Code Review
All Open Changes       Recently Closed
Clone: git clone https://git.eclipse.org/r/diffmerge/org.eclipse.emf.diffmerge.core