Spacing
Apparently this is new.
Don't rebase anymore.
Think the extra delimiters around --word-diff=plain aren't very useful.