Commit 63fdbedfb1e058306fbe60053eef0a050ab99016

Bruno Haible 2008-02-11T13:27:09

Specify custom merge drivers.