Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Mon, 22 May 2006 07:33:34 +0000 (00:33 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 22 May 2006 07:33:34 +0000 (00:33 -0700)
* master:
  diff: minor option combination fix.

1  2 
diff.c

diff --cc diff.c
Simple merge