diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-11-20 11:40:29 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-11-20 11:40:29 -0800 |
commit | 62ce40d9338046a89de5d2bfb6b258872fd366c0 (patch) | |
tree | caec918aacac7203a8d8c25145b412b9fed6a8cc /hex.c | |
parent | cb357221a402c55b23bf99ec9f3b361709d45fa7 (diff) | |
parent | f6c5a2968c103621adf6928a29e4895361eaa23b (diff) | |
download | git-62ce40d9338046a89de5d2bfb6b258872fd366c0.tar.gz git-62ce40d9338046a89de5d2bfb6b258872fd366c0.tar.xz |
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
Diffstat (limited to 'hex.c')
0 files changed, 0 insertions, 0 deletions