Merge branch 'en/rename-directory-detection-reboot'
* en/rename-directory-detection-reboot: merge-recursive: use xstrdup() instead of fixed buffer
This commit is contained in:
* en/rename-directory-detection-reboot: merge-recursive: use xstrdup() instead of fixed buffer