mirror of
https://github.com/Kitware/CMake.git
synced 2026-02-18 05:01:50 -06:00
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:
2
.gitattributes
vendored
2
.gitattributes
vendored
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user