summaryrefslogtreecommitdiff
path: root/.gitattributes
blob: 253cc6dee4b8c419ac30051a5fe7713119bec254 (plain)
1
Misc/NEWS   merge=union