Commit 5f206c3a authored by Brad King's avatar Brad King 💬
Browse files

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 17a1200c
...@@ -7,8 +7,6 @@ ...@@ -7,8 +7,6 @@
/clang-format.bash export-ignore eol=lf /clang-format.bash export-ignore eol=lf
/.clang-format export-ignore /.clang-format export-ignore
/CONTRIBUTING.rst conflict-marker-size=78
*.c whitespace=tab-in-indent,no-lf-at-eof *.c whitespace=tab-in-indent,no-lf-at-eof
*.h whitespace=tab-in-indent,no-lf-at-eof *.h whitespace=tab-in-indent,no-lf-at-eof
*.h.in whitespace=tab-in-indent,no-lf-at-eof *.h.in whitespace=tab-in-indent,no-lf-at-eof
...@@ -17,3 +15,5 @@ ...@@ -17,3 +15,5 @@
*.hxx.in whitespace=tab-in-indent,no-lf-at-eof *.hxx.in whitespace=tab-in-indent,no-lf-at-eof
*.txt whitespace=tab-in-indent,no-lf-at-eof *.txt whitespace=tab-in-indent,no-lf-at-eof
*.cmake whitespace=tab-in-indent,no-lf-at-eof *.cmake whitespace=tab-in-indent,no-lf-at-eof
*.rst whitespace=tab-in-indent conflict-marker-size=79
Supports Markdown
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