diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-03-27 10:57:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-27 10:57:57 -0700 |
| commit | 9a82efd0d2a2727507bd908d7f0545437fcc0ff6 (patch) | |
| tree | 4199ccd0c0c45c99da5c412b88344855d2909b22 /Documentation | |
| parent | Merge branch 'maint-1.8.1' into maint (diff) | |
| download | tgif-9a82efd0d2a2727507bd908d7f0545437fcc0ff6.tar.xz | |
More fixes for 1.8.2.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes/1.8.2.1.txt | 3 |
1 files changed, 3 insertions, 0 deletions
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. |