Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Apr 2010 04:31:20 +0000 (21:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Apr 2010 04:31:20 +0000 (21:31 -0700)
* maint:
  Documentation: Describe other situations where -z affects git diff

1  2 
Documentation/diff-options.txt

Simple merge