Merge branch 'ld/maint-diff-quiet-w'
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Mar 2010 20:44:10 +0000 (12:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Mar 2010 20:44:10 +0000 (12:44 -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