fix no-longer-correct `nonnull` attribute on merge err ret traces fn

911b1a0428Andrew Kelley committed on 8/12/2019, 2:05:09 AMparent62c5bc6
1 file changedLine totals unavailable