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

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 Sep 24, 2018 at 10:30 UTC bd3941a0aed0756aba43f504d0dea7a3fbe0c82b

No changes.