21-cherrypick.t: Fix typo
09-diff.t: Remove erroneous my
Cleanup whitespace issues