Merge branch 'kb/userdiff-rust-macro-rules'
commitdc53e7bc20347778cafb80d41bc37ce1a8902d55
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Oct 2020 22:09:46 +0000 (27 15:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Oct 2020 22:09:46 +0000 (27 15:09 -0700)
treef12e0dc0ede2d7b984a65940a597b0b227331450
parenta8a49ebf61449f80d8c5ea2f9768f0ca590e51dd
parenta04c7e0f1b6680385945ea901283d6335c4c108a
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
userdiff.c