diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/src/org/eclipse/emf/compare/ide/ui/tests/git/framework/internal/MergeStatement.java')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/src/org/eclipse/emf/compare/ide/ui/tests/git/framework/internal/MergeStatement.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/src/org/eclipse/emf/compare/ide/ui/tests/git/framework/internal/MergeStatement.java b/plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/src/org/eclipse/emf/compare/ide/ui/tests/git/framework/internal/MergeStatement.java index 0126df29d..54f7dc576 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/src/org/eclipse/emf/compare/ide/ui/tests/git/framework/internal/MergeStatement.java +++ b/plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/src/org/eclipse/emf/compare/ide/ui/tests/git/framework/internal/MergeStatement.java @@ -37,9 +37,9 @@ public class MergeStatement extends AbstractGitStatement { private String defaultMergeStrategy = MergeStrategyID.MODEL_RECURSIVE.getValue(); public MergeStatement(Object testObject, FrameworkMethod test, ResolutionStrategyID resolutionStrategy, - Class<?>[] disabledMatchEngineFactory, Class<?> diffEngine, Class<?> eqEngine, - Class<?> reqEngine, Class<?> conflictDetector, Class<?>[] disabledPostProcessors, - MergeStrategyID mergeStrategy, String path) { + Class<?>[] disabledMatchEngineFactory, Class<?> diffEngine, Class<?> eqEngine, Class<?> reqEngine, + Class<?> conflictDetector, Class<?>[] disabledPostProcessors, MergeStrategyID mergeStrategy, + String path) { super(testObject, test, resolutionStrategy, disabledMatchEngineFactory, diffEngine, eqEngine, reqEngine, conflictDetector, disabledPostProcessors); this.mergeStrategy = mergeStrategy; |