Merge branch 'aj/xfuncname-ada'

* aj/xfuncname-ada:
Add userdiff patterns for Ada

diff --combined Documentation/gitattributes.txt
index 462b79c120ddb132bd125104240a488cc31f877b,c693bfb49738c1c488574879adf3fcb0d310b450..99ed04d7abf7e0ee94feec6802e2dbf0da87f9d7
--- 1/Documentation/gitattributes.txt
--- 2/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@@ -511,6 -511,8 +511,8 @@@ configuration file (you still need to e
  attribute mechanism, via `.gitattributes`).  The following built in
  patterns are available:
  
+ - `ada` suitable for source code in the Ada language.
+ 
  - `bibtex` suitable for files with BibTeX coded references.
  
  - `cpp` suitable for source code in the C and C++ languages.
@@@ -927,7 -929,7 +929,7 @@@ file at the toplevel (i.e. not in any s
  macro attribute "binary" is equivalent to:
  
  ------------
 -[attr]binary -diff -text
 +[attr]binary -diff -merge -text
  ------------