.gitattributes
5b1d51c2
 CHANGELOG.md merge=union
e1416138
 .github/ export-ignore
 hacking/ export-ignore
 ticket-stubs/ export-ignore