Fix diff, conflict detection and merging of non-unique attributes90/148590/4
treeffa59ef23e99b5846d9b688feb6611fbb3ec5cde
-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