Commit 74f5b03651166b9fe9d327bdab887bba253941a6

Bruno Haible 2009-07-02T10:32:50

Specify custom merge drivers.