From: george espinoza <gespinoz2019@xxxxxxxxx> Prepare this command which currently handles its own argv to use parse-options instead. A lot of the commands already have parse-options and in git.c cmd_struct with the "NO_PARSEOPT" are the one's that still need it. Signed-off-by: george espinoza <gespinoz2019@xxxxxxxxx> --- builtin/merge-ours.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c index 4594507420..3980f4899a 100644 --- a/builtin/merge-ours.c +++ b/builtin/merge-ours.c @@ -11,6 +11,11 @@ #include "git-compat-util.h" #include "builtin.h" #include "diff.h" +#include "parse-options.h" + +/* parse-options.h added to initiate replacement of manual option parsing + * with parse-options. + */ static const char builtin_merge_ours_usage[] = "git merge-ours <base>... -- HEAD <remote>..."; -- gitgitgadget
