Merge branch 'ms/maint-config-error-at-eol-linecount' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 Mar 2012 19:10:05 +0000 (12:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Mar 2012 19:10:05 +0000 (12:10 -0700)
* ms/maint-config-error-at-eol-linecount:
  config: report errors at the EOL with correct line number

1  2 
config.c
t/t1300-repo-config.sh

diff --cc config.c
Simple merge
Simple merge