Range-diff !296

back to !296 ci: filter a rewritten branch against the merge base