From: george espinoza via GitGitGadget Date: Thu, 07 Nov 2019 08:09:57 GMT Subject: [PATCH 3/6] This file wasn't supposed to change during my git push for check-ref-format :( Message-ID: <078a19e86af6fcf1348d8988dc10cfac2e689ba4.1573114201.git.gitgitgadget@gmail.com> In-Reply-To: From: george espinoza Signed-off-by: george espinoza --- builtin/merge-ours.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c index 3980f4899a..4594507420 100644 --- a/builtin/merge-ours.c +++ b/builtin/merge-ours.c @@ -11,11 +11,6 @@ #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 ... -- HEAD ..."; -- gitgitgadget