More fixes for 1.8.2.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Mar 27, 2013 at 10:57 UTC
9a82efd0d2a2727507bd908d7f0545437fcc0ff6
1 file changed
+3
Documentation/RelNotes/1.8.2.1.txt
+3
@@ -66,3 +66,6 @@ Fixes since v1.8.2
66
to file scope static, but a few functions in graph.c were used by
67
CGit from sideways bypassing the entry points of the API the
68
in-tree users use.
69
+
70
+ * "git merge-tree" had a typo in the logic to detect d/f conflicts,
71
+ which caused it to segfault in some cases.