fixup: stash: convert apply to builtin

This change was introduced upstream in an evil merge.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

builtin/stash--helper.c

@@ -329,7 +329,7 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
 	if (info->has_u && restore_untracked(&info->u_tree))
 		return error(_("could not restore untracked files from stash"));
 
-	init_merge_options(&o);
+	init_merge_options(&o, the_repository);
 
 	o.branch1 = "Updated upstream";
 	o.branch2 = "Stashed changes";