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

This commit is contained in:
enkore 2017-06-08 13:11:49 +02:00 committed by GitHub
parent 524e0b5322
commit 63d94cd14b
1 changed files with 1 additions and 1 deletions

2
.gitattributes vendored
View File

@ -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