summaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index cb3565f..d959918 100644
--- a/.gitattributes
+++ b/.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