Merge branch 'maint'
authorJunio C Hamano <redacted>
Fri, 10 Sep 2010 16:39:08 +0000 (09:39 -0700)
committerJunio C Hamano <redacted>
Fri, 10 Sep 2010 16:39:08 +0000 (09:39 -0700)
* maint:
  config.txt: fix placement of diff.noprefix

1  2 
Documentation/config.txt

Simple merge
git clone https://git.99rst.org/PROJECT