diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-16 10:52:17 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-05-16 16:04:46 -0400 |
| commit | da60adc363b3e0e0dd5f1fee23bd0f7254be9a78 (patch) | |
| tree | 6e1fcf9017c05cf88ea3d2de6b0dcaf17582f6e0 /.gitattributes | |
| parent | c7006d2ef1c0e511ddccc7393cc2fd0d89a94b4c (diff) | |
| download | cmake-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 '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index cb3565f602..d959918c70 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,3 +21,5 @@ configure crlf=input *.cxx whitespace=tab-in-indent *.txt whitespace=tab-in-indent *.cmake whitespace=tab-in-indent + +*.rst whitespace=tab-in-indent conflict-marker-size=79 |