From 8c681aac500d0755bd68f8b322f7fdb20cd2b8a1 Mon Sep 17 00:00:00 2001 From: Andrey Loskutov Date: Mon, 30 May 2022 16:34:07 +0200 Subject: Fixed since tags added for new merge constants Bug: 356832 Change-Id: I70197522675de0e9b53399ee3d9ed3f10312ff6b --- org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java | 8 ++++---- 1 file 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"; -- cgit v1.2.3