From bbb93af138ddf739049cb0226459dbac51c0a764 Mon Sep 17 00:00:00 2001
From: zmatsuo <6488847+zmatsuo@users.noreply.github.com>
Date: Tue, 26 Mar 2024 23:18:55 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=96=E3=83=A9=E3=83=B3=E3=83=81=E3=82=92?=
 =?UTF-8?q?=E3=83=9E=E3=83=BC=E3=82=B8=E3=81=99=E3=82=8B=E6=99=82=E3=80=81?=
 =?UTF-8?q?=E6=94=B9=E7=89=88=E5=B1=A5=E6=AD=B4=E3=81=8C=E5=8E=9F=E5=9B=A0?=
 =?UTF-8?q?=E3=81=A7conflict=E3=81=8C=E7=99=BA=E7=94=9F=E3=81=97=E3=81=AB?=
 =?UTF-8?q?=E3=81=8F=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?=
 =?UTF-8?q?=20#178?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- history.html で使用する merge driver を union に変更
---
 doc/.gitattributes | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 doc/.gitattributes

diff --git a/doc/.gitattributes b/doc/.gitattributes
new file mode 100644
index 000000000..c51f0b8e6
--- /dev/null
+++ b/doc/.gitattributes
@@ -0,0 +1,2 @@
+en/html/about/history.html merge=union
+ja/html/about/history.html merge=union