Commit d3f0875a60c4112f004c21aa0e02db7af9e79597

Edward Thomson 2015-12-25T00:34:39

merge driver: tests for custom default merge drivers