Browse Source

gitattributes: docs/usage/*.rst.INC merge=ours

enkore 8 years ago
parent
commit
63d94cd14b
1 changed files with 1 additions and 1 deletions
  1. 1 1
      .gitattributes

+ 1 - 1
.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