mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-03-03 02:05:54 +00:00
Code Issues Releases Wiki Activity

docs: define "ours" merge strategy for auto-generated files

Browse source
This commit is contained in:
Marian Beermann 2017-02-05 23:01:41 +01:00
parent 1d9378f12c
commit 96fa1e8414
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitattributes vendored
View file

@ -1,3 +1,5 @@
borg/_version.py export-subst
*.py diff=python
docs/usage/* merge=ours
docs/man/* merge=ours

2
docs/man_intro.rst
View file

@ -46,7 +46,7 @@ A step-by-step example
NOTES
-----
.. include:: usage/general.rst.inc
.. include:: usage_general.rst.inc
SEE ALSO
--------

2
docs/usage.rst
View file

@ -12,7 +12,7 @@ command in detail.
General
-------
.. include:: usage/general.rst.inc
.. include:: usage_general.rst.inc
In case you are interested in more details (like formulas), please see
:ref:`internals`.

0
docs/usage/general.rst.inc → docs/usage_general.rst.inc
View file