Commit f29dde682866c293292ce405fcfef1511ced3f55

Jacques Germishuys 2015-03-12T12:29:47

Renamed git_merge_options 'flags' to 'tree_flags'