From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 25 Sep 2012 17:40:11 +0000 (-0700)
Subject: Merge branch 'aj/xfuncname-ada'
X-Git-Tag: v1.8.0-rc0~24
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c4eed8689b635e4c27759479afd656ea770607b7?ds=inline;hp=-c

Merge branch 'aj/xfuncname-ada'

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

c4eed8689b635e4c27759479afd656ea770607b7
diff --combined Documentation/gitattributes.txt
index 462b79c120,c693bfb497..99ed04d7ab
--- a/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
  ------------