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)
* js/diff-color-check:
  diff --check: use colour

1  2 
diff.c

diff --cc diff.c
Simple merge