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