From: Nanako Shiraishi Date: Sun, 20 Jul 2008 10:21:25 GMT Subject: [PATCH] Teach "git-merge" that "stupid" merge strategy no longer exists Message-ID: <20080720192125.6117@nanako3.lavabit.com> Next release 1.6.0 will not have "stupid" merge strategy, but "git merge -s confused origin" still includs it in the list of available merge strategies. Signed-off-by: Nanako Shiraishi --- builtin-merge.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/builtin-merge.c b/builtin-merge.c index 129b4e6..edc6016 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -54,7 +54,6 @@ static struct strategy all_strategy[] = { { "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL }, { "octopus", DEFAULT_OCTOPUS }, { "resolve", 0 }, - { "stupid", 0 }, { "ours", NO_FAST_FORWARD | NO_TRIVIAL }, { "subtree", NO_FAST_FORWARD | NO_TRIVIAL }, }; -- 1.5.6.3 -- Nanako Shiraishi http://ivory.ap.teacup.com/nanako3/