Merge branch 'uk/merge-subtree-doc-update' into maint

diff --git a/sequencer.c b/sequencer.c
index f388405b4e0d2c260f74777323a738ac845195e0..24451bb6838cdc0f934c6300660e57aa9237e47c 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -4145,9 +4145,7 @@ static int make_script_with_merges(struct pretty_print_context *pp,
                        struct object_id *oid = &parent->item->object.oid;
                        if (!oidset_contains(&interesting, oid))
                                continue;
-                       if (!oidset_contains(&child_seen, oid))
-                               oidset_insert(&child_seen, oid);
-                       else
+                       if (oidset_insert(&child_seen, oid))
                                label_oid(oid, "branch-point", &state);
                }