Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/AbstractConflictSearch.java
AgeCommit message (Expand)AuthorFilesLines
2016-06-15Switch to Eclipse mars.2Mathieu Cartaud1-9/+8
2016-05-30[494723] Use safeEGet instead of eGetLaurent Goubet1-3/+3
2016-02-01Scalable conflict detectorMathieu Cartaud1-0/+523

    Back to the top