[458147] Apply three-way merging also for rejecting attribute changes27/42927/2
[EMFCompare2.git] / plugins / org.eclipse.emf.compare.diagram.ide.ui / 
tree69dfedd63f5a70656999e91b3f87bb7ba8295bd0
drwxr-xr-x   ..
-rw-r--r-- 562 .checkstyle
-rw-r--r-- 369 .classpath
-rw-r--r-- 7 .gitignore
-rw-r--r-- 1041 .project
drwxr-xr-x - .settings
drwxr-xr-x - META-INF
-rw-r--r-- 9079 about.html
-rw-r--r-- 697 build.properties
-rw-r--r-- 610 plugin.properties
-rw-r--r-- 3471 plugin.xml
-rw-r--r-- 730 pom.xml
drwxr-xr-x - src