diff options
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 233cfcd7..f7c0ed7c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,5 @@ # See ./bootstrap for some helpful ~/.gitconfig or .git/config settings # needed for using these attributes effectively. -ChangeLog merge=merge-changelog *.texi* diff=texinfo null.* diff merge iso8859.m4 diff merge |