Merge branch 'maint'
commit5f54de5bd07481f6d88e8dbd5551f3356ecbf513
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jun 2008 00:39:50 +0000 (16 17:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jun 2008 00:39:50 +0000 (16 17:39 -0700)
treec7e18035bebac574a1c44a38ef4fa9daf7fe0ddc
parent9dc784a970ba5cc3871f7244c6bf6a823754f0a0
parent4afbcab9898ce63ad641dd0de6e9b69deda44330
Merge branch 'maint'

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