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