Browse Source

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.
master
Brad King 6 years ago
parent
commit
da60adc363
  1. 2
      .gitattributes

2
.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
Loading…
Cancel
Save