teldra
/
vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This will reduce merge conflicts for common/shlibs.
This commit is contained in:
Enno Boland 2016-01-07 10:45:15 +01:00
parent e6f038b7ab
commit a4e76983e3
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

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