Introduce git_merge_file for consumers
Add `git_merge_status` to provide info about an upcoming merge
Remove fastforward / uptodate from `git_merge`
Change signature of `git_merge` to take merge and checkout opts
Update git_merge_tree_opts to git_merge_options
Remove `git_merge_result` as it's now unnecessary
git_merge_status -> git_merge_analysis
Introduce GIT_MERGE_ANALYSIS_UNBORN
UNBORN implies FAST_FORWARD
Merge pull request #2183 from ethomson/merge_refactor

Refactor the `git_merge` API
env test needs to deref git_buf's ptr
Merge pull request #2201 from ethomson/gitbuf_test_fix

env test needs to deref git_buf's ptr