merge-recursive: use DIFF_XDL_SET macro