Merge branch 'gb/1.7.0-diff-whitespace-only-output'
authorJunio C Hamano <gitster@pobox.com>
Sat, 26 Dec 2009 22:03:18 +0000 (14:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 26 Dec 2009 22:03:18 +0000 (14:03 -0800)
* gb/1.7.0-diff-whitespace-only-output:
  No diff -b/-w output for all-whitespace changes

1  2 
diff.c

diff --cc diff.c
Simple merge