.gitattributes: merge=union may work for a book?

2023-03-20 19:30:07 +02:00 · 2023-03-20 19:30:07 +02:00 · 2b1287c1dc
parent 86c4a3f441
commit 2b1287c1dc
1 changed files with 1 additions and 1 deletions
--- 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