5 commits

Author	SHA1	Message	Date
enkore	63d94cd14b	gitattributes: docs/usage/*.rst.INC merge=ours	2017-06-08 13:11:49 +02:00
Marian Beermann	96fa1e8414	docs: define "ours" merge strategy for auto-generated files	2017-02-12 18:51:40 +01:00
Martin Hostettler	74ab7f1f61	.gitattributes: Set python diff mode for all *.py files.	2016-11-10 16:48:35 +01:00
Thomas Waldmann	5e98400a5a	fix all references to package name ... use relative imports if possible reorder imports (1. stdlib 2. dependencies 3. borg 4. borg.testsuite)	2015-05-22 19:21:41 +02:00
Jonas Borgström	3a9425f678	Added .gitattributes	2013-08-12 15:12:14 +02:00