This needs a rebase.
Also, from patch 01/10:
```diff
+[test] +uniform 0 float4 0.0 1.0 2.0 3.0 +uniform 4 float4 4.0 5.0 6.0 7.0 +uniform 8 float4 8.0 9.0 10.0 11.0 +uniform 12 float4 12.0 13.0 14.0 15.0 +draw quad +probe all rgba (0.0, 4.0, 5.0, 6.0)
--
```
That introduces an empty line at EOF, which git considers a whitespace error. I'm not sure we care quite that much, but I don't think git is wrong there.