[462938] Prevent infinite loop during merge.36/45036/3
tree6082a48e634c785beb15a4d9a042c9a727dbad64
-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