Add config constant for "mergeoptions"

Bug: 336933 Change-Id: Idcc0fbc8a8143dd665e80e4d6f4a4adaeae287db Signed-off-by: Chris Aniszczyk <zx@twitter.com>
12 years ago · 20c3b6b8a0
1 changed files with 3 additions and 0 deletions
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
@ -187,4 +187,7 @@ public class ConfigConstants {

 	/** The "pruneexpire" key */
 	public static final String CONFIG_KEY_PRUNEEXPIRE = "pruneexpire";
+
+	/** The "mergeoptions" key */
+	public static final String CONFIG_KEY_MERGEOPTIONS = "mergeoptions";
 }