merge-recursive: Improve handling of rename target vs. directory addition
[git] / t / t5100 / patch0013