Merge branch 'maint'

* maint:
  diff.c: fix emit_line() again not to add extra line

diff --cc diff.c
Simple merge