From 9aa377c2ed536858a3674a33e2e767212458d4e7 Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Thu, 19 Nov 2020 08:00:00 +0000
Subject: [PATCH] .gitattributes: specify a custom git merge driver for the
 ChangeLog file

---
 .gitattributes | 3 +++
 ChangeLog      | 4 ++++
 2 files changed, 7 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..1422d53
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+# See https://git.savannah.gnu.org/cgit/gnulib.git/plain/lib/git-merge-changelog.c
+# for making this useful.
+ChangeLog	merge=merge-changelog
diff --git a/ChangeLog b/ChangeLog
index 665054d..9893a30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2020-11-19  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* .gitattributes: New file.
+
 2020-11-17  Dmitry V. Levin  <ldv@altlinux.org>
 
 	* config.guess: Combine two heuristics to detect musl libc.