equal
deleted
inserted
replaced
2200 |
2200 |
2201 ctx - changeset to rebase |
2201 ctx - changeset to rebase |
2202 pctx - merge base, usually ctx.p1() |
2202 pctx - merge base, usually ctx.p1() |
2203 labels - merge labels eg ['local', 'graft'] |
2203 labels - merge labels eg ['local', 'graft'] |
2204 keepparent - keep second parent if any |
2204 keepparent - keep second parent if any |
2205 keepparent - if unresolved, keep parent used for the merge |
2205 keepconflictparent - if unresolved, keep parent used for the merge |
2206 |
2206 |
2207 """ |
2207 """ |
2208 # If we're grafting a descendant onto an ancestor, be sure to pass |
2208 # If we're grafting a descendant onto an ancestor, be sure to pass |
2209 # mergeancestor=True to update. This does two things: 1) allows the merge if |
2209 # mergeancestor=True to update. This does two things: 1) allows the merge if |
2210 # the destination is the same as the parent of the ctx (so we can use graft |
2210 # the destination is the same as the parent of the ctx (so we can use graft |