Merge branch 'ec/diff-noprefix-config'
commit2621ac50cc2c7bb236f7f4abf8bbbb7f30168ff6
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Jun 2010 18:16:55 +0000 (18 11:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Jun 2010 18:16:55 +0000 (18 11:16 -0700)
treeb062385dea4a4fbcb012b1a485cb3f008707a057
parent880bd9d08081752bb4e2891aa3c16c82808ecb2e
parentf89504ddb9392fa6b9407957bf26905fd1d59d0a
Merge branch 'ec/diff-noprefix-config'

* ec/diff-noprefix-config:
  diff: add configuration option for disabling diff prefixes.
Documentation/config.txt
diff.c