summaryrefslogtreecommitdiff
path: root/.clang-format
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-05-16 10:52:17 -0400
committerBrad King <brad.king@kitware.com>2016-05-16 16:04:46 -0400
commitda60adc363b3e0e0dd5f1fee23bd0f7254be9a78 (patch)
tree6e1fcf9017c05cf88ea3d2de6b0dcaf17582f6e0 /.clang-format
parentc7006d2ef1c0e511ddccc7393cc2fd0d89a94b4c (diff)
downloadcmake-da60adc363b3e0e0dd5f1fee23bd0f7254be9a78.tar.gz
Tell Git to use a distinct conflict marker size in `.rst` files
Use a long conflict marker size that is unlikely to be in conflict with a `=======` section header underline.
Diffstat (limited to '.clang-format')
0 files changed, 0 insertions, 0 deletions