diff options
| author | Andrey Loskutov <loskutov@gmx.de> | 2022-05-30 16:34:07 +0200 |
|---|---|---|
| committer | Andrey Loskutov <loskutov@gmx.de> | 2022-05-30 16:34:30 +0200 |
| commit | 8c681aac500d0755bd68f8b322f7fdb20cd2b8a1 (patch) | |
| tree | 06427c6180955aa4975df4090ff8cab97ae8fc56 /org.eclipse.jgit/src | |
| parent | d128c3112d76960c63a5b4df54246671c6ea5a33 (diff) | |
| download | jgit-8c681aac500d0755bd68f8b322f7fdb20cd2b8a1.tar.gz jgit-8c681aac500d0755bd68f8b322f7fdb20cd2b8a1.zip | |
Fixed since tags added for new merge constants
Bug: 356832
Change-Id: I70197522675de0e9b53399ee3d9ed3f10312ff6b
Diffstat (limited to 'org.eclipse.jgit/src')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java | 8 |
1 files changed, 4 insertions, 4 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 29c66f5165..2342cad0d7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java @@ -127,28 +127,28 @@ public final class ConfigConstants { /** * The "mergetool" section * - * @since 5.13 + * @since 6.2 */ public static final String CONFIG_MERGETOOL_SECTION = "mergetool"; /** * The "keepBackup" key within "mergetool" section * - * @since 5.13 + * @since 6.2 */ public static final String CONFIG_KEY_KEEP_BACKUP = "keepBackup"; /** * The "keepTemporaries" key within "mergetool" section * - * @since 5.13 + * @since 6.2 */ public static final String CONFIG_KEY_KEEP_TEMPORARIES = "keepTemporaries"; /** * The "writeToTemp" key within "mergetool" section * - * @since 5.13 + * @since 6.2 */ public static final String CONFIG_KEY_WRITE_TO_TEMP = "writeToTemp"; |