arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-18 04:18:10 +00:00
Code Issues Releases Wiki Activity

chore: add merge=union git attribute for changelogs (#1475)

Browse Source
This commit is contained in:
Pavol Rusnak 2021-02-19 21:25:47 +01:00 committed by GitHub
parent 63936b696a
commit c9e1eff6cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitattributes vendored Normal file
View File

@ -0,0 +1,4 @@
core/CHANGELOG.md merge=union
python/CHANGELOG.md merge=union
legacy/firmware/CHANGELOG.md merge=union
legacy/bootloader/CHANGELOG.md merge=union