Merge "[431882] Fix IllegalStateException in case of Pseudo Add Conflict."
treeb69bd31f6b80a55b073929080fb8d873131e7493
-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