mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-07-09 04:49:40 +00:00
Improve the management of the merge on debian/changelog
This commit is contained in:
parent
1c3d927f81
commit
66affa62a8
6
.gitattributes
vendored
Normal file
6
.gitattributes
vendored
Normal 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
|
Loading…
Reference in New Issue
Block a user