mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-19 04:41:50 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2635 from borgbackup/enkore-patch-1

Browse source 
gitattributes: docs/usage/*.rst.INC merge=ours
This commit is contained in:
enkore 2017-06-08 13:11:58 +02:00 committed by GitHub
commit 6add4daa54
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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