Commit 5aa2ac6de1622308884fd542f7b29e6810a0e98e

Edward Thomson 2014-03-11T22:47:39

Update git_merge_tree_opts to git_merge_options