From 63d94cd14bf18d216a46e1a8d6e605438458d977 Mon Sep 17 00:00:00 2001
From: enkore <public@enkore.de>
Date: Thu, 8 Jun 2017 13:11:49 +0200
Subject: [PATCH] gitattributes: docs/usage/*.rst.INC merge=ours

---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 3724dd9d..2657d942 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,5 @@
 borg/_version.py export-subst
 
 *.py diff=python
-docs/usage/* merge=ours
+docs/usage/*.rst.inc merge=ours
 docs/man/* merge=ours