meta: git controls for text changelogs; github controls

[exim.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644 (file)
index 0000000..3056717
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,7 @@
+# Using merge=union should make it easier to maintain changelogs across
+# branches, by using the text from both sides for the merge.
+#
+doc/doc-txt/NewStuff         merge=union
+doc/doc-txt/ChangeLog        merge=union
+doc/doc-txt/OptionLists.txt  merge=union
+src/README.UPDATING          merge=union