maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
PowerShell/.gitattributes
Andrew Schwartzmeyer d3e5ff9ba8 Set merge=union for changelog 
This will prevent the vast majority of conflicts with this file being
updated concurrently.
2016-08-04 14:57:13 -07:00

2 lines
25 B
Plaintext
Raw Blame History

CHANGELOG.md merge=union
Reference in a new issue View git blame Copy permalink