t / t5100 / msg0001on commit merge-recursive: Avoid doubly merging rename/add conflict contents (2a669c3)
   1Here is a patch from A U Thor.
   2