Merge branch 'maint'

* maint:
Trailing whitespace and no newline fix
diff --cc: a lost line at the beginning of the file is shown incorrectly
combine-diff.c: fix performance problem when folding common deleted lines

diff --cc combine-diff.c
Simple merge