Merge branch 'wc/diff'
authorJunio C Hamano <gitster@pobox.com>
Sat, 15 Dec 2007 05:42:53 +0000 (21:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 15 Dec 2007 05:42:53 +0000 (21:42 -0800)
* wc/diff:
Test interaction between diff --check and --exit-code
Use shorter error messages for whitespace problems
Add tests for "git diff --check" with core.whitespace options
Make "diff --check" output match "git apply"
Unify whitespace checking
diff --check: minor fixups
"diff --check" should affect exit status

Trivial merge