[434822] Conflict between move and delete94/27094/5
[EMFCompare2.git] / plugins / org.eclipse.emf.compare / src / org / eclipse / emf / compare / 
tree030c7a02809e047526eff2442d1ac0173dc74619
drwxr-xr-x   ..
-rw-r--r-- 18139 EMFCompare.java
-rw-r--r-- 2665 EMFCompareMessages.java
drwxr-xr-x - conflict
drwxr-xr-x - diff
-rw-r--r-- 1423 emfcomparemessages.properties
drwxr-xr-x - equi
drwxr-xr-x - internal
drwxr-xr-x - match
drwxr-xr-x - merge
drwxr-xr-x - postprocessor
drwxr-xr-x - req
drwxr-xr-x - scope
drwxr-xr-x - utils