.gitattributes | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 set up dpkg-mergechangelogs
 To deal with the merged upstream and Debian changelog.