Specify custom merge drivers.
authorBruno Haible <bruno@clisp.org>
Mon, 11 Feb 2008 12:27:09 +0000 (13:27 +0100)
committerBruno Haible <bruno@clisp.org>
Mon, 11 Feb 2008 12:30:16 +0000 (13:30 +0100)
commit63fdbedfb1e058306fbe60053eef0a050ab99016
tree3a1a004a5424136260bb0fabe94a15014c5bf282
parent0f37e2e6ef48a1b0befb5c952ccb9cb013187053
Specify custom merge drivers.
.gitattributes [new file with mode: 0644]
ChangeLog