.gitattributes: Set merge union merge driver for common/shlibs

This will reduce merge conflicts for common/shlibs.
2016-01-07 10:45:15 +01:00
parent e6f038b7ab
commit 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