findutils/.gitattributes
James Youngman 718bde6572 Revert the previous ChangeLog split and split at 2013 instead.
* 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 c3e93017c2850cee2d2c15e03f66dedc1a2f445d.

Conflicts:
	ChangeLog
2014-08-23 14:20:14 +01:00

3 lines
75 B
Plaintext

ChangeLog merge=merge-changelog
ChangeLog-2013 merge=merge-changelog