diff options
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 5d425843f..b83edcae0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,3 @@ debian/changelog merge=dpkg-mergechangelogs +.git-annex/*.log merge=union +.git-annex/*/*/*.log merge=union |