equal
deleted
inserted
replaced
27 a master development tree. |
27 a master development tree. |
28 |
28 |
29 If a rebase is interrupted to manually resolve a merge, it can be continued |
29 If a rebase is interrupted to manually resolve a merge, it can be continued |
30 with --continue or aborted with --abort. |
30 with --continue or aborted with --abort. |
31 """ |
31 """ |
32 originalwd = target = source = None |
32 originalwd = target = None |
33 external = nullrev |
33 external = nullrev |
34 state = skipped = {} |
34 state = skipped = {} |
35 |
35 |
36 lock = wlock = None |
36 lock = wlock = None |
37 try: |
37 try: |