tree a5ca8861407caf017fa94167906953573ba62a94
parent fde273d1c27bbfe944e620501ba7166c23997326
author Bruno Haible <bruno@clisp.org> 1246523570 +0200
committer Bruno Haible <bruno@clisp.org> 1246523570 +0200

Specify custom merge drivers.