>From 06684c510ab3115093178cdcfb28c2fff41b324c Mon Sep 17 00:00:00 2001
Message-Id: <address@hidden>
In-Reply-To: <address@hidden>
References: <address@hidden>
From: Stefano Lattarini <address@hidden>
Date: Tue, 14 Feb 2012 13:25:35 +0100
Subject: [PATCH 2/2] gitattributes: custom merge driver for ChangeLog not
 needed anymore

* .gitattributes: We don't maintain a version-controlled ChangeLog
file anymore, so we have no need to specify a custom merge driver
for it anymore.  Update accordingly.
---
 .gitattributes |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 6fec56e..5126add 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,2 @@
-ChangeLog merge=merge-changelog
 NEWS merge=union
 *.texi* diff=texinfo
-- 
1.7.7.3