From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 17 Feb 2008 01:56:51 +0000 (-0800)
Subject: Merge branch 'jk/noetcconfig'
X-Git-Tag: v1.5.5-rc0~210
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fef1c4c0a0766b83cfacaf6276d7bd0d1aa9a2e4?hp=fef1c4c0a0766b83cfacaf6276d7bd0d1aa9a2e4

Merge branch 'jk/noetcconfig'

* jk/noetcconfig:
fix config reading in tests
allow suppressing of global and system config

Conflicts:

cache.h
---