Sign in
eclipse
/
emfcompare
/
org.eclipse.emf.compare
/
851f823d7d66c3d6bcd22f88430e9db4da94a3a1
/
.
/
plugins
/
org.eclipse.emf.compare.tests
/
src
/
org
/
eclipse
/
emf
/
compare
/
tests
/
merge
tree: 81334081bbbc1f5701d88e571934eb44e4ea412d [
path history
]
[
tgz
]
data/
AbstractMergerTest.java
Bug485266_MoveDeleteConflict_Test.java
ConflictImplicationsTest_Bug484579.java
ConflictMergeTest.java
ExtensionMergeTest.java
FeatureMaps2wayMergeTest.java
FeatureMaps3wayMergeTest.java
FeatureMapsConflictsMergeTest.java
FeatureMapsPseudoConflictsMergeTest.java
IndividualMergeOutOfScopeValuesTest.java
IndividualMergeTest.java
MultiLineAttributeMergeTest.java
MultipleMergeTest.java
PseudoConflictMergeTest.java
RefineMergeTest.java
ThreeWayAttributeMergeScenario.java
ThreeWayBatchMergingTest.java
TwoWayBatchMergingTest.java