Merge "[434822] Conflict between move and delete"
tree72fc6e422846130adc52a6c1a883cdef44950a59
-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