diffstat rename squashing fix.