Fixed since tags added for new merge constants
Bug: 356832 Change-Id: I70197522675de0e9b53399ee3d9ed3f10312ff6b
This commit is contained in:
parent
d128c3112d
commit
8c681aac50
|
@ -127,28 +127,28 @@ public final class ConfigConstants {
|
||||||
/**
|
/**
|
||||||
* The "mergetool" section
|
* The "mergetool" section
|
||||||
*
|
*
|
||||||
* @since 5.13
|
* @since 6.2
|
||||||
*/
|
*/
|
||||||
public static final String CONFIG_MERGETOOL_SECTION = "mergetool";
|
public static final String CONFIG_MERGETOOL_SECTION = "mergetool";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The "keepBackup" key within "mergetool" section
|
* The "keepBackup" key within "mergetool" section
|
||||||
*
|
*
|
||||||
* @since 5.13
|
* @since 6.2
|
||||||
*/
|
*/
|
||||||
public static final String CONFIG_KEY_KEEP_BACKUP = "keepBackup";
|
public static final String CONFIG_KEY_KEEP_BACKUP = "keepBackup";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The "keepTemporaries" key within "mergetool" section
|
* The "keepTemporaries" key within "mergetool" section
|
||||||
*
|
*
|
||||||
* @since 5.13
|
* @since 6.2
|
||||||
*/
|
*/
|
||||||
public static final String CONFIG_KEY_KEEP_TEMPORARIES = "keepTemporaries";
|
public static final String CONFIG_KEY_KEEP_TEMPORARIES = "keepTemporaries";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The "writeToTemp" key within "mergetool" section
|
* The "writeToTemp" key within "mergetool" section
|
||||||
*
|
*
|
||||||
* @since 5.13
|
* @since 6.2
|
||||||
*/
|
*/
|
||||||
public static final String CONFIG_KEY_WRITE_TO_TEMP = "writeToTemp";
|
public static final String CONFIG_KEY_WRITE_TO_TEMP = "writeToTemp";
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue