[487011] Fix wrong conflict detection41/65541/7
tree4a9ca222ed6911e2a86e51d6f2d091aaefc9fd74
-rw-r--r-- 48 .gitignore
-rw-r--r-- 4444 README.textile
drwxr-xr-x - org.eclipse.emf.compare-parent
drwxr-xr-x - packaging
drwxr-xr-x - performance
drwxr-xr-x - plugins
drwxr-xr-x - tutorial