Merge branch 'ob/am-msgfix' into maint-2.42
commitfa5799cd348f465c13b1514f4cc4258db251bd02
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Nov 2023 07:53:25 +0000 (2 16:53 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Nov 2023 07:53:25 +0000 (2 16:53 +0900)
treeed4614c836c17fbfac385ee48441e46c87fe3fa2
parent8a5b2e1157e11b9674360ffb78880ee35c965bc9
parent43abaaf0087c72fccc5bbf3fc103eb148465480d
Merge branch 'ob/am-msgfix' into maint-2.42

The parameters to generate an error message have been corrected.

* ob/am-msgfix:
  am: fix error message in parse_opt_show_current_patch()
builtin/am.c