Merge branch 'maint'
commit9dc784a970ba5cc3871f7244c6bf6a823754f0a0
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2008 23:14:22 +0000 (16 16:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2008 23:14:22 +0000 (16 16:14 -0700)
treeecff10a922f352693b7411574b41898dfe16ae17
parent336d09daf288492946f0c51f071da11643f8363d
parent06ff64ae3d8c1d446ff61cff78a8faa3a07bfe24
Merge branch 'maint'

* maint:
  diff: reset color before printing newline
diff.c