t / t5100 / msg0006on commit checkout.txt: note about losing staged changes with --merge (a7256de)
   1Here is a patch from A U Thor.
   2