mirror of
git://git.sv.gnu.org/findutils.git
synced 2026-01-28 20:43:21 +01:00
718bde6572
* 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
3 lines
75 B
Plaintext
3 lines
75 B
Plaintext
ChangeLog merge=merge-changelog
|
|
ChangeLog-2013 merge=merge-changelog
|