From 2b1287c1dc1b7963aec1c54609aceaa956e9324b Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen+git@mikaela.info>
Date: Mon, 20 Mar 2023 19:30:07 +0200
Subject: [PATCH] .gitattributes: merge=union may work for a book?

---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index cc7e282..e452138 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
-*	text=auto eol=lf
+	text=auto eol=lf merge=union
 *.pdf	filter=lfs diff=lfs merge=lfs -text