| author | Tomasz Zarna | 2012-11-18 16:35:53 (EST) |
|---|---|---|
| committer | Chris Aniszczyk | 2012-11-18 19:32:37 (EST) |
| commit | 20c3b6b8a0ba4f3d9f5666dd48b132839ab7e5bf (patch) (side-by-side diff) | |
| tree | a5900156beb06f140a3cf9c5823aa3c03682f133 | |
| parent | 6a94f027b6302f1630ccbad8fd4dc5d7f54645d4 (diff) | |
| download | jgit-20c3b6b8a0ba4f3d9f5666dd48b132839ab7e5bf.zip jgit-20c3b6b8a0ba4f3d9f5666dd48b132839ab7e5bf.tar.gz jgit-20c3b6b8a0ba4f3d9f5666dd48b132839ab7e5bf.tar.bz2 | |
Add config constant for "mergeoptions"refs/changes/53/8753/2
Bug: 336933
Change-Id: Idcc0fbc8a8143dd665e80e4d6f4a4adaeae287db
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java | 3 |
1 files changed, 3 insertions, 0 deletions
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 483482e..c20006e 100644 --- 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"; } |