The `flags` member of `git_merge_options` is now called `tree_flags`.
The `flags` member of `git_merge_options` is now called `tree_flags`.

tpickett66/rugged,saraid/rugged,libgit2/rugged,Acidburn0zzz/rugged,tpickett66/rugged,Acidburn0zzz/rugged,Acidburn0zzz/rugged,tpickett66/rugged,saraid/rugged,saraid/rugged,libgit2/rugged,libgit2/rugged