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 b98b07d7d..5d425843f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -.git-annex/*.log merge=union +debian/changelog merge=dpkg-mergechangelogs |