Merge branch 'ml/userdiff-rust'
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Jun 2019 18:24:08 +0000 (11:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Jun 2019 18:24:08 +0000 (11:24 -0700)
The pattern "git diff/grep" use to extract funcname and words
boundary for Rust has been added.

* ml/userdiff-rust:
  userdiff: two simplifications of patterns for rust
  userdiff: add built-in pattern for rust

1  2 
Documentation/gitattributes.txt
userdiff.c

Simple merge
diff --cc userdiff.c
Simple merge