diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-02-14 13:25:35 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-02-14 13:25:35 +0100 |
| commit | 06684c510ab3115093178cdcfb28c2fff41b324c (patch) | |
| tree | 074a26c5e11688acf0379f196dc25f9d2fefb207 /.gitattributes | |
| parent | f874f9eeb7d996a7fc56c11342e9a094a87a402a (diff) | |
| download | automake-06684c510ab3115093178cdcfb28c2fff41b324c.tar.gz | |
gitattributes: custom merge driver for ChangeLog not needed anymore
* .gitattributes: We don't maintain a version-controlled ChangeLog
file anymore, so we have no need to specify a custom merge driver
for it anymore. Update accordingly.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 6fec56e1b..5126add6d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,2 @@ -ChangeLog merge=merge-changelog NEWS merge=union *.texi* diff=texinfo |