Code

Merge branch 'js/color-diff'
authorJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 02:24:47 +0000 (19:24 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 02:24:47 +0000 (19:24 -0700)

Trivial merge