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

set merge driver union for common/shlibs.
2016-01-07 15:56:41 +01:00 · 2016-01-07 15:56:41 +01:00 · 822759d5a5
commit 822759d5a5
parent e0c8f8e2f9 a4e76983e3
1 changed files with 1 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1 +1,2 @@
 template linguist-language=bash
+common/shlibs merge=union