From da60adc363b3e0e0dd5f1fee23bd0f7254be9a78 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 16 May 2016 10:52:17 -0400
Subject: [PATCH] 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.
---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index cb3565f60..d959918c7 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