From: Junio C Hamano Date: Wed, 27 Mar 2013 17:57:57 +0000 (-0700) Subject: More fixes for 1.8.2.1 X-Git-Tag: v1.8.2.1~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a82efd0d2a2727507bd908d7f0545437fcc0ff6;p=thirdparty%2Fgit.git More fixes for 1.8.2.1 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/RelNotes/1.8.2.1.txt b/Documentation/RelNotes/1.8.2.1.txt index 23977562a9..b4cf3cccde 100644 --- 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.