summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2014-06-18 15:41:50 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-06-18 14:56:17 -0700
commit9e1a5ebe52d84c35eee18a896ad1b8bab53cadbf (patch)
treede07f8aa40074aa8235a564e063e4d0b79c94fcb /mergetools/p4merge
parentThird batch for 2.1 (diff)
downloadtgif-9e1a5ebe52d84c35eee18a896ad1b8bab53cadbf.tar.xz
parse_diff_color_slot: drop ofs parameter
This function originally took a whole config variable name ("var") and an offset ("ofs"). It checked "var+ofs" against each color slot, but reported errors using the whole "var". However, since 8b8e862 (ignore unknown color configuration, 2009-12-12), it returns -1 rather than printing its own error, and therefore only cares about var+ofs. We can drop the ofs parameter and teach its sole caller to derive the pointer itself. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions