t / t5100 / msg0016on commit merge-recursive: Fix working copy handling for rename/rename/add/add (3672c97)
   1and some content
   2