From: Junio C Hamano <junkio@cox.net>
Date: Sun, 13 Aug 2006 02:24:47 +0000 (-0700)
Subject: Merge branch 'js/color-diff'
X-Git-Tag: v1.4.3-rc1~273
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=edbda4d6af7404c97c62ab6af86edf525020cf51;p=git.git

Merge branch 'js/color-diff'
---

edbda4d6af7404c97c62ab6af86edf525020cf51