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 (file)
index 72c2395..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-TODO merge=union