annotate .gitattributes @ 9694:6a8d9b9a5d7c

Specify custom merge drivers.
author Bruno Haible <bruno@clisp.org>
date Mon, 11 Feb 2008 13:27:09 +0100
parents
children 2e5821b6f988
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9694
6a8d9b9a5d7c Specify custom merge drivers.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1 ChangeLog merge=merge-changelog