From 91d1d935dd034850c152455bfab8f9df227a682f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 19 Mar 2011 18:56:36 -0400
Subject: [PATCH] git-annex setup

---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 5d425843f2..b83edcae09 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,3 @@
 debian/changelog merge=dpkg-mergechangelogs
+.git-annex/*.log merge=union
+.git-annex/*/*/*.log merge=union