kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Brad King 2016-05-16 10:52:17 -04:00
parent c7006d2ef1
commit da60adc363
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -21,3 +21,5 @@ configure crlf=input
*.cxx whitespace=tab-in-indent *.cxx whitespace=tab-in-indent
*.txt whitespace=tab-in-indent *.txt whitespace=tab-in-indent
*.cmake whitespace=tab-in-indent *.cmake whitespace=tab-in-indent
*.rst whitespace=tab-in-indent conflict-marker-size=79