Martin von Zweigbergk <martinvonz@google.com> [Fri, 21 Jul 2023 09:22:18 -0700] rev 50806
contrib: upgrade merge-lists from clap v3 to clap v4
Mostly to avoid having clap v3 in our dependencies, due to
https://osv.dev/vulnerability/GHSA-g98v-hv3f-hcfr (even though that seems pretty
harmless).