Merge "[428916] Rejecting addition with local history doesn't work"
tree75119535d0db7bffe010436d4a0cbf15c72b8bfb
-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