diff options
| author | Marian Beermann <public@enkore.de> | 2017-02-05 23:01:41 +0100 |
|---|---|---|
| committer | Marian Beermann <public@enkore.de> | 2017-02-12 18:51:40 +0100 |
| commit | 96fa1e8414b5cd02ebc4c53b589f68f8bfd6b9fa (patch) | |
| tree | cbb53a78d576c23c9fa448ce27efc0bd8c442d34 /.gitattributes | |
| parent | 1d9378f12ce23ed32783aecddf6881844f490089 (diff) | |
docs: define "ours" merge strategy for auto-generated files
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 9d00a6907..3724dd9dd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,5 @@ borg/_version.py export-subst *.py diff=python +docs/usage/* merge=ours +docs/man/* merge=ours |