The command-line "diff" does not ignore whitespace at the end of lines and
it generates a well-formed patch file that can be fed directly into
"patch -p 0".  Ticket [a9f7b23c2e376af].  GUI diffs and the merge commands
do ignore end-of-line whitespace.