2 Commits

Author	SHA1	Message	Date
Marian Beermann	96fa1e8414	docs: define "ours" merge strategy for auto-generated files	2017-02-12 18:51:40 +01:00
Marian Beermann	fa24e1f38f	man pages: add borg(1) master/intro page	2017-02-12 15:28:59 +01:00