[PATCH] Teach 'git merge' that 'recur' merge strategy no longer exists

From: Miklos Vajna <vmiklos@frugalware.org>
Date: Jul 20, 2008, 12:12 UTC
Message-ID: <1216555968-31406-1-git-send-email-vmiklos@frugalware.org>
In-Reply-To: <20080720192125.6117@nanako3.lavabit.com>

It co-existed with 'recursive' when rewriting it in C, but it no longer available.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---

On Sun, Jul 20, 2008 at 07:21:25PM +0900, Nanako Shiraishi <nanako3@lavabit.com> wrote:

> -     { "stupid",     0 },

If we are at it, recur is also something unnecessary here.

 builtin-merge.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/builtin-merge.c b/builtin-merge.c
index 129b4e6..beba635 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -50,7 +50,6 @@ static size_t use_strategies_nr, use_strategies_alloc;
 static const char *branch;
 
 static struct strategy all_strategy[] = {
-	{ "recur",      NO_TRIVIAL },
 	{ "recursive",  DEFAULT_TWOHEAD | NO_TRIVIAL },
 	{ "octopus",    DEFAULT_OCTOPUS },
 	{ "resolve",    0 },

-- 
1.5.6.2.450.g8d367.dirty