Commit 1fb9df72 authored by Junio C Hamano's avatar Junio C Hamano

Merge branch 'en/rename-directory-detection-reboot'

* en/rename-directory-detection-reboot:
  merge-recursive: use xstrdup() instead of fixed buffer
parents f0ac6e39 94eff2b6
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment