From fdd2c97c0b6673599d2d1ea030980799a6abbb59 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <bonzini@gnu.org>
Date: Thu, 31 Jul 2008 10:52:07 +0200
Subject: [PATCH] add a .gitattributes file to use the git-merge-changelog
 driver

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..e8495d51
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+ChangeLog merge=merge-changelog
-- 
2.45.2