t / t5100 / msg0001on commit merge: fix numerus bugs around "trivial merge" area (446247d)
   1Here is a patch from A U Thor.
   2