Commit 9900794a authored by Howard Chu's avatar Howard Chu
Browse files

ITS#9329 Re-fix merge_state

A bit uglier but more straightforward.
parent c1411b81
Pipeline #778 passed with stage
in 32 minutes and 32 seconds