blob: d9f9663cd6828db67703d04e2e5f70a83e5fbbe6 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
/*******************************************************************************
* Copyright (c) 2016 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
package org.eclipse.emf.compare.ide.ui.tests.git.framework;
/**
* The different merge strategies. These strategies are provided by EGit or EMFCompare.
*
* @author <a href="mailto:mathieu.cartaud@obeo.fr">Mathieu Cartaud</a>
*/
public enum GitMergeStrategyID {
JGIT_DEFAULT("jgit-default-mergeStrategy"), //$NON-NLS-1$
MODEL_RECURSIVE("model recursive"), //$NON-NLS-1$
MODEL_ADDITIVE("model additive"); //$NON-NLS-1$
private String value;
private GitMergeStrategyID(String value) {
this.value = value;
}
public String getValue() {
return value;
}
}
|
