wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-04-15 13:46:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
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

2 lines
58 B
Text
Raw Blame History

template linguist-language=bash
common/shlibs merge=union
Reference in a new issue View git blame Copy permalink