Merge branch 'js/diff'
commit2cc06a0500b4b69e8563f76c42306e36b1f0aabf
authorJunio C Hamano <junkio@cox.net>
Mon, 26 Jun 2006 21:28:42 +0000 (26 14:28 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 26 Jun 2006 21:28:42 +0000 (26 14:28 -0700)
tree0a5a66efedea7a8c4884fb9a4588a330f77538cc
parent57be46fd213b448f66b1470187109e7d6ad6f475
parent0d21efa51cc7de5250d5da46bceacda78ba35373
Merge branch 'js/diff'

* js/diff:
  Teach diff about -b and -w flags
diff.c