From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 20 Nov 2014 19:40:29 +0000 (-0800)
Subject: Merge branch 'jn/parse-config-slot' into jk/colors
X-Git-Tag: v2.3.0-rc0~46^2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/62ce40d9338046a89de5d2bfb6b258872fd366c0?ds=sidebyside;hp=62ce40d9338046a89de5d2bfb6b258872fd366c0

Merge branch 'jn/parse-config-slot' into jk/colors

* jn/parse-config-slot:
color_parse: do not mention variable name in error message
pass config slots as pointers instead of offsets
---