t / t5100 / msg0016on commit merge-recursive: Avoid doubly merging rename/add conflict contents (2a669c3)
   1and some content
   2