Skip to content

Commit 87a8a00

Browse files
committed
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 <newren@gmail.com>
1 parent 5f33295 commit 87a8a00

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

merge-ort.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5229,7 +5229,7 @@ static void merge_ort_internal(struct merge_options *opt,
52295229
* base of our merge bases.
52305230
*/
52315231
if (merge_bases->next)
5232-
opt->priv->vmb_favor = 0;
5232+
opt->priv->vmb_favor = XDL_MERGE_FAVOR_BASE;
52335233
else
52345234
opt->priv->vmb_favor = XDL_MERGE_FAVOR_BASE;
52355235
} else if (opt->ancestor) {

t/t6404-recursive-merge.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ test_expect_success 'virtual trees were processed' '
9191
git ls-files --stage >out &&
9292
9393
cat >expect <<-EOF &&
94-
100644 $(git rev-parse main:a1) 1 a1
94+
100644 $(test_oid idxstage1) 1 a1
9595
100644 $(git rev-parse F:a1) 2 a1
9696
100644 $(git rev-parse G:a1) 3 a1
9797
EOF

0 commit comments

Comments
 (0)