tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
Files
15e2dd1947535b2b70e07f8417a00f7d2c2035f5
void-packages/.gitattributes
Enno Boland a4e76983e3 .gitattributes: Set merge union merge driver for common/shlibs 
This will reduce merge conflicts for common/shlibs.
2016-01-07 10:53:04 +01:00

3 lines
58 B
Plaintext
Raw Blame History

template linguist-language=bash
common/shlibs merge=union
Reference in New Issue View Git Blame Copy Permalink