.gitattributes: Set merge union merge driver for common/shlibs
This will reduce merge conflicts for common/shlibs.
This commit is contained in:
parent
e6f038b7ab
commit
a4e76983e3
|
@ -1 +1,2 @@
|
|||
template linguist-language=bash
|
||||
common/shlibs merge=union
|
||||
|
|
Loading…
Reference in New Issue