* ChangeLog-2013: Split the ChangeLog at 2013 rather than 2008;
hence, delete ChangeLog-2008.
* Makefile.am (EXTRA_DIST): Distribute ChangeLog-2013.
* .gitattributes: Use the ChangeLog merge driver for ChangeLog-2013.
This reverts commit c3e93017c2.
Conflicts:
ChangeLog
* ChangeLog-2008: Split this file out from the main ChangeLog file.
* Makefile.am (EXTRA_DIST): Distribute ChangeLog-2008.
* .gitattributes: Use the changelog merge driver for
ChangeLog-2008.
* import-gnulib.sh (check_merge_driver): Add the missing arguments
to the changelog driver. Change the name of the merge driver from
cl-merge to merge-changelog, for consistency with gnulib,
coreutils, autoconf, libtool, and m4.
Signed-off-by: James Youngman <jay@gnu.org>
* import-gnulib.sh (check_merge_driver): New function; verifies
that we have a merge driver installed for the ChangeLog file (if
we're on the master or release branch, the check is skipped).
Also check that the .gitattributes file exists.
* README-hacking: Point out that using a merge driver for ChangeLog is
a good idea.
* .gitattributes: new file
Signed-off-by: James Youngman <jay@gnu.org>
