Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2008 23:14:22 +0000 (16:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2008 23:14:22 +0000 (16:14 -0700)
* maint:
  diff: reset color before printing newline

1  2 
diff.c

diff --cc diff.c
Simple merge