t7606: fix custom merge test