Merge branch 'mm/maint-config-explicit-bool-display' into maint
commit634b29d2705af2e05d593b75ade2be64033468a5
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 17:49:24 +0000 (21 10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 17:49:24 +0000 (21 10:49 -0700)
tree4f24501d02783c804ee76e751cba8057a1b8a8cb
parent1844f8d591340bb43e4990c96afd0aba424adf48
parent008e3cc5d781273053c79d1ccf8cc3bf36086a07
Merge branch 'mm/maint-config-explicit-bool-display' into maint

* mm/maint-config-explicit-bool-display:
  config: display key_delim for config --bool --get-regexp
builtin/config.c
t/t1300-repo-config.sh