summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/RelNotes/2.15.1.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/RelNotes/2.15.1.txt b/Documentation/RelNotes/2.15.1.txt
index a6ae4c1aeb..ec06704e63 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.