[488700] Change label to Conflict [X out of Y differences unresolved]47/67547/4
tree90f3d7b4b73f6d1e4efac1d6ba74651f2e11560d
-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