mostly white space diffs; and line endings