Merge branch 'gb/1.7.0-diff-whitespace-only-output'
commit648f40701764cc3b47f2d2978518852e2aeb42cf
authorJunio C Hamano <gitster@pobox.com>
Sat, 26 Dec 2009 22:03:18 +0000 (26 14:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 26 Dec 2009 22:03:18 +0000 (26 14:03 -0800)
tree38111ee58e089e336b4c981cdfba00911c4e5dde
parent3cc3fb7df67dc9c83b71fec82e5bfb1df3724089
parent3e97c7c6af2901cec63bf35fcd43ae3472e24af8
Merge branch 'gb/1.7.0-diff-whitespace-only-output'

* gb/1.7.0-diff-whitespace-only-output:
  No diff -b/-w output for all-whitespace changes
diff.c