debce7c
test: check if we can use --merge with --follow Provides coverage for #24565. (cherry picked from commit c11c50a53f677f3977f3144b9fc5f02a3516de9f)