test: wait for host-merged conflicts to reach guests

Assisted-by: gpt-6.1-sol
55d5656dafclover caruso committed on 10/4/2026, 2:15:52 AMparent9a82329
1 file changedLine totals unavailable