Specify custom merge drivers.

This commit is contained in:
Bruno Haible 2009-07-02 10:33:57 +02:00
parent cce72a7039
commit 9eb1959057

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
ChangeLog merge=merge-changelog