What if I use the strategy for >= 3 merge bases?

FIXME: Try to determine either better wording for why it is bad (and
maybe an example), or explain why it's fine...

Signed-off-by: Elijah Newren <[email protected]>

Author: newren

merge-ort.c

@@ -5229,7 +5229,7 @@ static void merge_ort_internal(struct merge_options *opt,
 		 * base of our merge bases.
 		 */
 		if (merge_bases->next)
-			opt->priv->vmb_favor = 0;
+			opt->priv->vmb_favor = XDL_MERGE_FAVOR_BASE;
 		else
 			opt->priv->vmb_favor = XDL_MERGE_FAVOR_BASE;
 	} else if (opt->ancestor) {

t/t6404-recursive-merge.sh

@@ -91,7 +91,7 @@ test_expect_success 'virtual trees were processed' '
 	git ls-files --stage >out &&
 
 	cat >expect <<-EOF &&
-	100644 $(git rev-parse main:a1) 1	a1
+	100644 $(test_oid idxstage1) 1	a1
 	100644 $(git rev-parse F:a1) 2	a1
 	100644 $(git rev-parse G:a1) 3	a1
 	EOF