Merge branch 'maint'
commitf873dd5ac22fee648f9097d5a91200b6f4850ae0
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Jan 2009 09:08:10 +0000 (21 01:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Jan 2009 09:08:10 +0000 (21 01:08 -0800)
treeeffdbc042e8919b36c92faca7707f84bbbac2a07
parent2b5189e51855312a91dd23b5e7311c48944bc382
parent950db8798d51cb183c858938263425b367b21dfd
Merge branch 'maint'

* maint:
  Rename diff.suppress-blank-empty to diff.suppressBlankEmpty
Documentation/config.txt
diff.c