From db0968c66ff8e4cb583e132105d6f1fb2924d9c6 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 16 Jul 2015 00:08:21 -0400
Subject: [PATCH] gitconfig: add merge-changelog driver

---
 .gitconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitconfig b/.gitconfig
index 52821c7..9dcfea2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -51,6 +51,9 @@
 	conflictstyle = diff3
 [rebase]
 	autosquash = true
+[merge "merge-changelog"]
+	name = GNU-style ChangeLog merge driver
+	driver = /usr/bin/git-merge-changelog %O %A %B
 [sendemail]
 	chainreplyto = false
 	confirm = always
-- 
2.39.5