t / t5100 / msg0001on commit merge overwrites unstaged changes in renamed file (30fd3a5)
   1Here is a patch from A U Thor.
   2