t / t5100 / msg0001on commit merge-file: support -p and -q; fix compile warnings (fbe0b24)
   1Here is a patch from A U Thor.
   2