Add a constant in ConfigConstants, and a ConflictStyle enum in MergeCommand. Change-Id: Idf8e036b6b6953bec06d6923a39e5ff30c2da562 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>tags/v5.12.0.202105261145-m3
private ProgressMonitor monitor = NullProgressMonitor.INSTANCE; | private ProgressMonitor monitor = NullProgressMonitor.INSTANCE; | ||||
/** | |||||
* Values for the "merge.conflictStyle" git config. | |||||
* | |||||
* @since 5.12 | |||||
*/ | |||||
public enum ConflictStyle { | |||||
/** "merge" style: only ours/theirs. This is the default. */ | |||||
MERGE, | |||||
/** "diff3" style: ours/base/theirs. */ | |||||
DIFF3 | |||||
} | |||||
/** | /** | ||||
* The modes available for fast forward merges corresponding to the | * The modes available for fast forward merges corresponding to the | ||||
* <code>--ff</code>, <code>--no-ff</code> and <code>--ff-only</code> | * <code>--ff</code>, <code>--no-ff</code> and <code>--ff-only</code> |
/** The "ff" key */ | /** The "ff" key */ | ||||
public static final String CONFIG_KEY_FF = "ff"; | public static final String CONFIG_KEY_FF = "ff"; | ||||
/** | |||||
* The "conflictStyle" key. | |||||
* | |||||
* @since 5.12 | |||||
*/ | |||||
public static final String CONFIG_KEY_CONFLICTSTYLE = "conflictStyle"; | |||||
/** | /** | ||||
* The "checkstat" key | * The "checkstat" key | ||||
* | |||||
* @since 3.0 | * @since 3.0 | ||||
*/ | */ | ||||
public static final String CONFIG_KEY_CHECKSTAT = "checkstat"; | public static final String CONFIG_KEY_CHECKSTAT = "checkstat"; |