diff options
| author | enkore <public@enkore.de> | 2017-06-08 13:11:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-08 13:11:49 +0200 |
| commit | 63d94cd14bf18d216a46e1a8d6e605438458d977 (patch) | |
| tree | d155c756090f8a151f0d9e1b9d57c27bc560d939 /.gitattributes | |
| parent | 524e0b5322dfe910f2b76340ea4e0a66de95bfd0 (diff) | |
gitattributes: docs/usage/*.rst.INC merge=ours
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 3724dd9dd..2657d9424 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 |