t / t5100 / msg0015on commit merge overwrites unstaged changes in renamed file (30fd3a5)
   1  - a list
   2  - of stuff