Merge branch 'js/diff'

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

diff --cc diff.c
Simple merge