From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Nov 2018 13:57:44 +0000 (+0900)
Subject: Merge branch 'en/rerere-multi-stage-1-fix' into maint
X-Git-Tag: v2.19.2~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4eafbcdb84fc406bff37f06fdf6310aca7d0249;p=git

Merge branch 'en/rerere-multi-stage-1-fix' into maint

A corner case bugfix in "git rerere" code.

* en/rerere-multi-stage-1-fix:
  rerere: avoid buffer overrun
  t4200: demonstrate rerere segfault on specially crafted merge
---

b4eafbcdb84fc406bff37f06fdf6310aca7d0249