summaryrefslogtreecommitdiffstats
path: root/path_utils
diff options
context:
space:
mode:
authorDmitri Pal <dpal@redhat.com>2010-12-25 23:29:05 -0500
committerDmitri Pal <dpal@redhat.com>2011-01-03 15:00:42 -0500
commit2323da5507a13b5267152482a212442685cfcf05 (patch)
tree628815109a4758dbcdf44b8319efa7e944802bd5 /path_utils
parent6a66a986e962554b161ddb46f8b1e85a7c791e27 (diff)
downloadding-libs-2323da5507a13b5267152482a212442685cfcf05.tar.gz
ding-libs-2323da5507a13b5267152482a212442685cfcf05.tar.xz
ding-libs-2323da5507a13b5267152482a212442685cfcf05.zip
[INI] 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.
Diffstat (limited to 'path_utils')
0 files changed, 0 insertions, 0 deletions