tree eb884c0f7da85bc2055fa82fa6d2b5fccc33a457
parent 29f4b695a798500cb493daf480f10e66cd994e84
author Andrew Pickford <anpickford@googlemail.com> 1490611406 +0200
committer Andrew Pickford <anpickford@googlemail.com> 1490611406 +0200

handle merge options at parameter initialisation