From e15385c339ca8bf1d9896b542a866736b6dca924 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 Jan 2011 18:12:52 -0400
Subject: [PATCH] git-annex setup

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..b98b07d7d2
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+.git-annex/*.log merge=union