Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jun 2008 00:39:50 +0000 (17:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jun 2008 00:39:50 +0000 (17:39 -0700)
* maint:
  diff.c: fix emit_line() again not to add extra line

1  2 
diff.c

diff --cc diff.c
Simple merge