Sign in
eclipse
/
emf-store
/
org.eclipse.emf.emfstore.core
/
3d78610d9e5693f966e2000e70dcb6766ce618ca
/
.
/
bundles
/
org.eclipse.emf.emfstore.client
/
src
/
org
/
eclipse
/
emf
/
emfstore
/
internal
/
client
/
model
/
changeTracking
/
merging
/
conflict
tree: 026c759457191d1a71c67f98d5d210d1bb9ee931 [
path history
]
[
tgz
]
conflicts/
options/
ConflictContext.java
ConflictDescription.java
ConflictOption.java
CustomConflictOption.java
CustomConflictOptionFactory.java
Messages.java
messages.properties
VisualConflict.java