maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Set merge=union for changelog

Browse source 
This will prevent the vast majority of conflicts with this file being
updated concurrently.
This commit is contained in:
Andrew Schwartzmeyer 2016-08-04 14:57:13 -07:00
parent a3a149ae5d
commit d3e5ff9ba8
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 Normal file
View file

@ -0,0 +1 @@
CHANGELOG.md merge=union