| commit | 3e18a6433d97c05db93aec795a860fe4a4d6adf3 | [log] [tgz] |
|---|---|---|
| author | Andrew Pickford <anpickford@googlemail.com> | Wed Mar 22 12:57:57 2017 +0100 |
| committer | Andrew Pickford <anpickford@googlemail.com> | Wed Mar 22 12:57:57 2017 +0100 |
| tree | 7a25a0e0c6c4694ace65238c738a8da6ae2cd7a5 | |
| parent | 2f6e9f5e2e4aa3b3849bf5369e554cfcd706698c [diff] |
make merge options a class variable for parameter