Show More
| @@ -2202,7 +2202,7 b' def graft(repo, ctx, pctx, labels=None, ' | |||||
| 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 | |
General Comments 0
You need to be logged in to leave comments.
Login now