see #858
2 things to fix here with Repo.mergeBranches:

• it should take a MergeOptions.
• it might be able to use the preference stuff now, rather than explicitly going on way or the other, which would clean up significantly.
• Add git_merge_analysis to our libgit2 doc supplement and use that in Repository#mergeBranches to clean up our manual implementation of that function.