summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2018-06-05 14:40:45 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-11 09:41:01 -0700
commite4d2d55ae46216872c9eaa3b9d0072aa8361d5d3 (patch)
tree7920ef13ed699d9df1a5e400d473ba37505ab816 /t/t7600-merge.sh
parentcheckout.c: introduce an *_INIT macro (diff)
downloadtgif-e4d2d55ae46216872c9eaa3b9d0072aa8361d5d3.tar.xz
checkout.c: change "unique" member to "num_matches"
Internally track how many matches we find in the check_tracking_name() callback. Nothing uses this now, but it will be made use of in a later change. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7600-merge.sh')
0 files changed, 0 insertions, 0 deletions