Add config constant for "mergeoptions"

Bug: 336933
Change-Id: Idcc0fbc8a8143dd665e80e4d6f4a4adaeae287db
Signed-off-by: Chris Aniszczyk <zx@twitter.com>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
index 483482e18ed272e975cdda49597a968c71b058db..c20006e38e5153cd23cecefbf042289c0d8e0d31 100644 (file)
--- 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";
 }