[434822] Conflict between move and delete94/27094/5
tree3475a220f1be2bb7a5a69851efdd9d6b302202b8
-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