]> git.ipfire.org Git - thirdparty/automake.git/commit
projects / thirdparty / automake.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f874f9e) | patch
gitattributes: custom merge driver for ChangeLog not needed anymore
authorStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 14 Feb 2012 12:25:35 +0000 (13:25 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 14 Feb 2012 12:25:35 +0000 (13:25 +0100)
commit06684c510ab3115093178cdcfb28c2fff41b324c
tree074a26c5e11688acf0379f196dc25f9d2fefb207tree
parentf874f9eeb7d996a7fc56c11342e9a094a87a402acommit | diff
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.
.gitattributes diff | blob | blame | history
Mirror of https://github.com/autotools-mirror/automake.git