From 9b185bef0c15cec1ea8753ce091e42ea041f2c31 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Nov 2017 13:39:14 +0900
Subject: Git 2.15.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/2.15.1.txt b/Documentation/RelNotes/2.15.1.txt
index a6ae4c1..ec06704 100644
--- a/Documentation/RelNotes/2.15.1.txt
+++ b/Documentation/RelNotes/2.15.1.txt
@@ -82,4 +82,7 @@ Fixes since v2.15
  * An ancient bug in "git apply --ignore-space-change" codepath has
    been fixed.
 
+ * There was a recent semantic mismerge in the codepath to write out a
+   section of a configuration section, which has been corrected.
+
 Also contains various documentation updates and code clean-ups.
-- 
cgit v0.10.2-6-g49f6