[PATCH] Fix --merge-order unit test breaks introduced by 6c88be169881c9223532796bd225...