diff options
| author | martin f. krafft <madduck@debian.org> | 2010-05-27 11:27:14 +0200 |
|---|---|---|
| committer | martin f. krafft <madduck@debian.org> | 2010-05-27 11:27:14 +0200 |
| commit | cf7eca64e222f7df64f198b88d2d5ddb7684c793 (patch) | |
| tree | 8ef379cfb159f7a3277f14bf244db5061a9d390f /.gitattributes | |
| parent | ba133e3b1e0ae18160c5ea2b3f8496d824e637d4 (diff) | |
enable automatic changelog merging
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..5d425843 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +debian/changelog merge=dpkg-mergechangelogs |