aphrody-labs/PowerShell
1
0 Fork 0
mirror of https://github.com/aphrody-labs/PowerShell.git synced 2026-10-17 04:36:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
Files
77a4e96795f9440b414ead2abf4352f697c7aa79
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