From f450110e738dc068f320d403eab77a68d61105a4 Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Sun, 5 Jul 2020 11:30:04 -0700
Subject: [PATCH] Removing the .gitattributes file

I'm exploring a more robust approach for this feature, where the nogit
repository need not maintain this file, but instead, nogit itself will
ensure that all files have a merge=union driver applied during the
merge operation.
---
 .gitattributes | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 72c2395..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-TODO merge=union
-- 
2.43.0