t / t5100 / msg0017on commit merge: fix NULL pointer dereference when merging nothing into void (b84e65d)
   1New content here
   2