More fixes for 1.8.2.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-27 10:57:57 -07:00 · 2013-03-27 10:57:57 -07:00 · 9a82efd0d2
parent d011ab4312
commit 9a82efd0d2
1 changed files with 3 additions and 0 deletions
--- 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.