From: Carl Worth <cworth@cworth.org>
Date: Sat, 4 Jul 2020 16:37:52 +0000 (-0700)
Subject: Specify "union" merge strategy for the TODO file
X-Git-Url: https://git.cworth.org/git?p=lmno-todo;a=commitdiff_plain;h=f3a05ea071392077eb5629a34f33037acab7cab4;ds=sidebyside

Specify "union" merge strategy for the TODO file

This gives the semantics that I described in the previous
commit. Conflicts will be resolved by keeping both sides in the file,
and without conflict markers. This is not expected to be perfect, but
is expected to be easy for people to fix up without having to think
much about it.
---

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