t / t5100 / msg0016on commit merge overwrites unstaged changes in renamed file (30fd3a5)
   1and some content
   2