m4/.gitattributes
Eric Blake 5e49a742b4 Use gnulib's git-merge-changelog driver when available.
* .gitattributes: Add merge attributes for ChangeLog.
* bootstrap: Install driver, if not already present.

Signed-off-by: Eric Blake <ebb9@byu.net>
2008-02-11 11:19:18 -07:00

4 lines
72 B
Plaintext

null.* diff merge
iso8859.m4 diff merge
ChangeLog merge=merge-changelog