More fixes for 1.8.2.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mirror · Mar 27, 2013 · 9a82efd · 9a82efd
1 parent d011ab4
commit 9a82efd
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/Documentation/RelNotes/1.8.2.1.txt b/Documentation/RelNotes/1.8.2.1.txt
@@ -66,3 +66,6 @@ Fixes since v1.8.2
    to file scope static, but a few functions in graph.c were used by
    CGit from sideways bypassing the entry points of the API the
    in-tree users use.
+
+ * "git merge-tree" had a typo in the logic to detect d/f conflicts,
+   which caused it to segfault in some cases.