diff options
| author | Joey Hess <joey@kitenet.net> | 2010-05-24 11:12:35 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-05-24 11:12:35 -0400 |
| commit | c5693eb872c10beb7f2abf5086b79dc0095ab750 (patch) | |
| tree | a35137bcdd4d590568e9e01ac4bcb347ea6eab37 | |
| parent | ae491f11ac0f2448e411effe4289cd962cfb206f (diff) | |
use dpkg-mergechangelog
| -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 |