proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-10-19 01:56:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/6.0' into 7

Browse Source
This commit is contained in:
Sylvestre Ledru 2018-09-11 11:43:44 +02:00
commit 9c65b1e79c
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitattributes vendored Normal file
View File

@ -0,0 +1,6 @@
debian/changelog merge=dpkg-mergechangelogs
# ~/.gitconfig should have
# [merge "dpkg-mergechangelogs"]
# name = debian/changelog merge driver
# driver = dpkg-mergechangelogs -m %O %A %B %A