Merge branch 'jn/parse-config-slot' into jk/colors
authorJunio C Hamano <gitster@pobox.com>
Thu, 20 Nov 2014 19:40:29 +0000 (11:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Nov 2014 19:40:29 +0000 (11:40 -0800)
* jn/parse-config-slot:
color_parse: do not mention variable name in error message
pass config slots as pointers instead of offsets

No differences found