The flags member of git_merge_options is now called tree_flags.

arthurschreiber · arthurschreiber · commit 1b6cf50907a9 · 2015-03-20T11:58:00.000+01:00
diff --git a/ext/rugged/rugged_tree.c b/ext/rugged/rugged_tree.c
@@ -614,7 +614,7 @@ void rugged_parse_merge_options(git_merge_options *opts, VALUE rb_options)
 		}
 
 		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("renames")))) {
-			opts->flags |= GIT_MERGE_TREE_FIND_RENAMES;
+			opts->tree_flags |= GIT_MERGE_TREE_FIND_RENAMES;
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -614,7 +614,7 @@ void rugged_parse_merge_options(git_merge_options *opts, VALUE rb_options)`
`614`	`614`	`}`
`615`	`615`
`616`	`616`	`if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("renames")))) {`
`617`		`- opts->flags \|= GIT_MERGE_TREE_FIND_RENAMES;`
	`617`	`+ opts->tree_flags \|= GIT_MERGE_TREE_FIND_RENAMES;`
`618`	`618`	`}`
`619`	`619`	`}`
`620`	`620`	`}`