Commit da60adc3 authored by Brad King's avatar Brad King

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.
parent c7006d2e
......@@ -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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment