mirrors/PowerShell
0
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell.git synced 2024-11-23 17:53:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
e7e82ede96
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 New Issue View Git Blame Copy Permalink