diff options
| author | Joey Hess <joey@kitenet.net> | 2010-06-25 13:43:02 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-06-25 13:43:02 -0400 |
| commit | 7399f56607d789b2152b9461397b93b8db88ccff (patch) | |
| tree | afb87b8e99956c29f0655e5a571478ecf812eb94 | |
| parent | 1f6ea9a626d9983ce84343e6a73604d58aa1df09 (diff) | |
| download | ikiwiki-7399f56607d789b2152b9461397b93b8db88ccff.tar ikiwiki-7399f56607d789b2152b9461397b93b8db88ccff.tar.gz | |
auto changelog merging
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..5d425843f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +debian/changelog merge=dpkg-mergechangelogs |