summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-23 14:54:32 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-23 14:54:32 -0700
commit2997ea960f7da94d74742ed41006f0afdb2164e7 (patch)
treee63adff736a593686e3a67192fddfe727821967d /ll-merge.h
parentMerge branch 'pb/commit-verbose-config' (diff)
parentt0040: convert a few tests to use test-parse-options --expect (diff)
downloadtgif-2997ea960f7da94d74742ed41006f0afdb2164e7.tar.xz
Merge branch 'jc/test-parse-options-expect'
t0040 had too many unnecessary repetitions in its test data. Teach test-parse-options program so that a caller can tell what it expects in its output, so that these repetitions can be cleaned up. * jc/test-parse-options-expect: t0040: convert a few tests to use test-parse-options --expect t0040: remove unused test helpers test-parse-options: --expect=<string> option to simplify tests test-parse-options: fix output when callback option fails
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions