Merge branch 'js/diff-color-check'
authorJunio C Hamano <junkio@cox.net>
Tue, 20 Feb 2007 02:30:59 +0000 (18:30 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 20 Feb 2007 02:30:59 +0000 (18:30 -0800)
commit0bce7a52f2b723bf6717be2951df7c0a49337592
treef69180a8eb8cb6f5e3bae0c0bc51a6621887424e
parent50cfde14531a5b354bbc3a070fe39c1ee86e2915
parentc5a8c3ecd7fcec68b05b38640d4eac4e1cc7f50f
Merge branch 'js/diff-color-check'

* js/diff-color-check:
  diff --check: use colour
diff.c