summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2010-12-18 22:53:58 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-19 10:49:34 -0800
commitac5ad864c2fdd3e354ac72e09e7cfec1df6eae79 (patch)
tree2dc0cde2b5ea94a9d46e90c7947170484822e6bd /ll-merge.h
parentMerge branch 'jn/parse-options-extra' (diff)
downloadtgif-ac5ad864c2fdd3e354ac72e09e7cfec1df6eae79.tar.xz
t2107: mark passing test as success
This failed on the branch where it was introduced, but was fixed by merging with 6e67619 (Merge branch 'jn/parse-options-extra'). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions