summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-10-27 15:09:46 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-10-27 15:09:46 -0700
commitdc53e7bc20347778cafb80d41bc37ce1a8902d55 (patch)
treef12e0dc0ede2d7b984a65940a597b0b227331450 /ll-merge.c
parentMerge branch 'js/userdiff-php' (diff)
parentuserdiff: recognize 'macro_rules!' as starting a Rust function block (diff)
downloadtgif-dc53e7bc20347778cafb80d41bc37ce1a8902d55.tar.xz
Merge branch 'kb/userdiff-rust-macro-rules'
Userdiff for Rust update. * kb/userdiff-rust-macro-rules: userdiff: recognize 'macro_rules!' as starting a Rust function block
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions