diff options
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 5d425843f..a81b30b93 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -debian/changelog merge=dpkg-mergechangelogs +CHANGELOG merge=dpkg-mergechangelogs |