From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Jun 2008 00:39:50 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.6~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5f54de5bd07481f6d88e8dbd5551f3356ecbf513;p=git.git

Merge branch 'maint'

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

5f54de5bd07481f6d88e8dbd5551f3356ecbf513