Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/conflictscope
AgeCommit message (Expand)AuthorFilesLines
2014-12-16Adds unit test for enum3.1.0M4Arthur Daussy6-0/+19
2014-12-04[442897] Pseudo conflicts under Real Add conflictsAxel Richard3-0/+64
2013-09-24[416400] - Fix IOWrappedException by adding a ConflictMergerAxel Richard24-0/+214

    Back to the top