Commit fa78782f67d17c5b139a2bbe3ceefe54c8c71dd3

Edward Thomson 2015-10-22T17:00:09

merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`