From 6aa1f3b84bc42d98916ec6410d5901c1bd46041d Mon Sep 17 00:00:00 2001 From: Dmitri Pal Date: Sat, 25 Dec 2010 23:29:05 -0500 Subject: New merge flags Adding "DETECT" merge modes. These modes would be useable for dry run cases to detect if there are any potential merge conflicts. Patch just defines new constans and adds input checks. --- ini/ini_configobj.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ini/ini_configobj.h') diff --git a/ini/ini_configobj.h b/ini/ini_configobj.h index 36558a7..f0c6882 100644 --- a/ini/ini_configobj.h +++ b/ini/ini_configobj.h @@ -108,6 +108,8 @@ #define INI_MV1S_PRESERVE 0x0002 /** @brief Duplicates are allowed */ #define INI_MV1S_ALLOW 0x0003 +/** @brief Duplicates are allowed but errors are logged */ +#define INI_MV1S_DETECT 0x0004 /** * @} @@ -133,6 +135,8 @@ #define INI_MV2S_PRESERVE 0x0020 /** @brief Duplicates are allowed */ #define INI_MV2S_ALLOW 0x0030 +/** @brief Duplicates are allowed but errors are logged */ +#define INI_MV2S_DETECT 0x0040 /** * @} @@ -159,6 +163,8 @@ #define INI_MS_PRESERVE 0x0300 /** @brief Duplicates are allowed */ #define INI_MS_ALLOW 0x0400 +/** @brief Duplicates are allowed but errors are logged */ +#define INI_MS_DETECT 0x0500 /** * @} -- cgit