Merge branch 'en/rename-directory-detection'
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Jun 2018 17:18:44 +0000 (10:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Jun 2018 17:18:44 +0000 (10:18 -0700)
Newly added codepath in merge-recursive had potential buffer
overrun, which has been fixed.

* en/rename-directory-detection:
  merge-recursive: use xstrdup() instead of fixed buffer

1  2 
merge-recursive.c

Simple merge