Fix Spinach merge request diff failures

gitlab-git-test `master` was updated in ff076d88, and this caused the merge request diffs to change in a way that broke assumptions in the Spinach tests.
    
Partial fix to #23378

See merge request !6916