summaryrefslogtreecommitdiff
path: root/.gitattributes
Commit message (Collapse)AuthorAgeFilesLines
* doc: improve git diff of texinfo filesEric Blake2009-08-141-0/+5
| | | | | | | | * .gitattributes: Add rule for *.texi files, with hint on how to use it. Copied from m4, and based on a report by Bruno Haible. Signed-off-by: Eric Blake <ebb9@byu.net>
* Specify custom merge drivers.Bruno Haible2008-02-111-0/+1