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

Junio C Hamano committed Nov 21, 2018 at 22:57 UTC b4eafbcdb84fc406bff37f06fdf6310aca7d0249

No changes.