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