Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc/maint-blank-at-eof
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Sep 2009 18:21:10 +0000 (11:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Sep 2009 18:21:10 +0000 (11:21 -0700)
commitd91ba8fa88a83ec70588700a56c8a4c1e8beb1be
tree53b32ebb2a282130dbd2b8d764bf22d55b97a960
parent61c6457e893f568524155b4197a6be076a27ce3d
parent7f7ee2ff2dfbb8435a4b46750f573ef0f7d0b853
Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc/maint-blank-at-eof

* jc/maint-1.6.0-blank-at-eof:
  diff -B: colour whitespace errors
diff.c