[458147] Apply three-way merging also for rejecting attribute changes27/42927/2
tree0b3cc00b94b253a4627e4eaea17c6259cf972432
-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