Commit 02105a27f01509ce4e641487cae040662ee477a2

Edward Thomson 2014-03-11T18:40:38

Change signature of `git_merge` to take merge and checkout opts