Merge branch 'jk/config-test-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Oct 2011 17:47:59 +0000 (10:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Oct 2011 17:47:59 +0000 (10:47 -0700)
* jk/config-test-cleanup:
  t1300: attempting to remove a non-existent .git/config is not an error

1  2 
t/t1300-repo-config.sh

Simple merge