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)
commitb05b52027c0e43abc9629049944283729a07899f
tree0720a55ceb41729702f2a75c40dc3bce7dacbe20
parent7b8e4ab07c6ebc72e311804c9c79ef93cfbbe704
parent5e363541d0431b640e4bbbafb2941d1c64fa13c4
Merge branch 'master' into next

* master:
  diff: minor option combination fix.
diff.c