commit bb30be6b3335c67ee59d3705d5e04e2dbb688128
author Andrey Loskutov <loskutov@gmx.de> Mon May 30 12:42:20 2022 -0400
committer Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> Mon May 30 12:42:20 2022 -0400
tree 6bb2c4188f1fac42120407a425774ad713e42780
parent 8c681aac500d0755bd68f8b322f7fdb20cd2b8a1
parent e81085944f1a039566f2972c863d189724988b46

Merge "Add filtering with help of DirCacheCheckout.getContent()"

org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java

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 29c66f5..2342cad 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 @@
 	/**
 	 * 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";