]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'kb/userdiff-rust-macro-rules'
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Oct 2020 22:09:46 +0000 (15:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Oct 2020 22:09:46 +0000 (15:09 -0700)
Userdiff for Rust update.

* kb/userdiff-rust-macro-rules:
  userdiff: recognize 'macro_rules!' as starting a Rust function block

1  2 
userdiff.c

diff --cc userdiff.c
Simple merge