strvec: rename struct fields

[thirdparty/git.git] / merge.c

diff --git a/merge.c b/merge.c
index a05b054faa27399cd14d2ae1ab0a2534870f1259..753e461659e62812e60fe863bf76269cc8784f82 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -33,7 +33,7 @@ int try_merge_command(struct repository *r,
        for (j = remotes; j; j = j->next)
                strvec_push(&args, merge_argument(j->item));
 
-       ret = run_command_v_opt(args.argv, RUN_GIT_CMD);
+       ret = run_command_v_opt(args.v, RUN_GIT_CMD);
        strvec_clear(&args);
 
        discard_index(r->index);