From: Carl Worth <cworth@cworth.org>
Date: Sun, 5 Jul 2020 18:30:04 +0000 (-0700)
Subject: Removing the .gitattributes file
X-Git-Url: https://git.cworth.org/git?p=lmno-todo;a=commitdiff_plain;h=f450110e738dc068f320d403eab77a68d61105a4

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.
---

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