Modify merge to handle implications properly02/34202/2
treed6ddf688c97a3890090b474740d40a71b569a39b
-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