Simplify display of conflict objects
tree6644acdb792be50b7275acdfa7e9ef780a9eee4e
-rw-r--r-- 27 .gitignore
drwxr-xr-x - org.eclipse.emf.compare-parent
drwxr-xr-x - packaging
drwxr-xr-x - plugins