tree 7a25a0e0c6c4694ace65238c738a8da6ae2cd7a5
parent 2f6e9f5e2e4aa3b3849bf5369e554cfcd706698c
author Andrew Pickford <anpickford@googlemail.com> 1490183877 +0100
committer Andrew Pickford <anpickford@googlemail.com> 1490183877 +0100

make merge options a class variable for parameter