admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
a164609eea080b68fbe72d235e7e4799b02238fa
PowerShell-PowerShell/.gitattributes
T
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