t / t5100 / msg0016on commit merge-recursive: Improve handling of rename target vs. directory addition (51931bf)
   1and some content
   2