tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #3325 from Gottox/shlibs-merge-driver

Browse Source 
set merge driver union for common/shlibs.
This commit is contained in:
Enno Boland
2016-01-07 15:56:41 +01:00
parent e0c8f8e2f9 a4e76983e3
commit 822759d5a5
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@@ -1 +1,2 @@
template linguist-language=bash template linguist-language=bash
common/shlibs merge=union