summaryrefslogtreecommitdiff
path: root/userdiff.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-05-14 14:39:45 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-05-14 14:39:45 -0700
commitac140beebe11adbca5801c225e87802d706590c4 (patch)
treecef148da2e3867433017daec3822e2b226e9550d /userdiff.h
parentMerge branch 'sn/midx-repack-with-config' (diff)
parentt5500: count objects through stderr, not trace (diff)
downloadtgif-ac140beebe11adbca5801c225e87802d706590c4.tar.xz
Merge branch 'jt/t5500-unflake'
Test fix for a topic already in 'master' and meant for 'maint'. * jt/t5500-unflake: t5500: count objects through stderr, not trace
Diffstat (limited to 'userdiff.h')
0 files changed, 0 insertions, 0 deletions