Commit d8f984bc4980a491ffc61dcfdd57bed27c34ff0d

Simon Byrne 2017-01-03T10:54:24

move git_merge_options changes to correct location