Merge "Add pseudo conflict diffs to the required consequences shown in UI"
tree4b4ce88bc62339d8d3e7ba4342f20507e10a6dfa
-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