Properly describe what the conflict resolving actions will do.87/146187/1
tree502cc6b3a1fa7290b4373ca322b5b8618e45e6a0
-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