Code

Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Sep 2009 18:20:46 +0000 (11:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Sep 2009 18:20:46 +0000 (11:20 -0700)
* 'jc/maint-1.6.0-blank-at-eof' (early part):
  diff.c: emit_add_line() takes only the rest of the line
  diff.c: split emit_line() from the first char and the rest of the line

1  2 
diff.c

diff --cc diff.c
Simple merge