summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-11-25 15:24:54 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-11-25 15:24:54 -0800
commit7bd645e21d1ec66ec265d83e7f68e21086cc0a98 (patch)
tree1e9659022f63dc1a381edcb39dba6cf6a2578b47 /ll-merge.c
parentMerge branch 'rs/plug-diff-cache-leak' (diff)
parenttests: fix description of 'test_set_prereq' (diff)
downloadtgif-7bd645e21d1ec66ec265d83e7f68e21086cc0a98.tar.xz
Merge branch 'sg/tests-prereq'
A lazily defined test prerequisite can now be defined in terms of another lazily defined test prerequisite. * sg/tests-prereq: tests: fix description of 'test_set_prereq' tests: make sure nested lazy prereqs work reliably
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions