Merge branch 'ld/maint-diff-quiet-w' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Mar 2010 06:26:39 +0000 (22:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Mar 2010 06:26:39 +0000 (22:26 -0800)
* ld/maint-diff-quiet-w:
git-diff: add a test for git diff --quiet -w
git diff --quiet -w: check and report the status

1  2 
diff.c
diff --cc diff.c
Simple merge