[434828] Test Merge Conflict Diff With Conflicting Diff With RequiredBy79/27079/4
treebcf4004cb00c03d4512b4bdcdc0247a1c511f45e
-rw-r--r-- 48 .gitignore
-rw-r--r-- 4438 README.textile
drwxr-xr-x - org.eclipse.emf.compare-parent
drwxr-xr-x - packaging
drwxr-xr-x - plugins