t / t5100 / msg0015on commit merge-recursive: Avoid doubly merging rename/add conflict contents (2a669c3)
   1  - a list
   2  - of stuff