equal
deleted
inserted
replaced
126 the intended source branch). |
126 the intended source branch). |
127 |
127 |
128 If a rebase is interrupted to manually resolve a merge, it can be |
128 If a rebase is interrupted to manually resolve a merge, it can be |
129 continued with --continue/-c or aborted with --abort/-a. |
129 continued with --continue/-c or aborted with --abort/-a. |
130 |
130 |
131 Returns 0 on success, 1 if nothing to rebase. |
131 Returns 0 on success, 1 if nothing to rebase or there are |
|
132 unresolved conflicts. |
132 """ |
133 """ |
133 originalwd = target = None |
134 originalwd = target = None |
134 activebookmark = None |
135 activebookmark = None |
135 external = nullrev |
136 external = nullrev |
136 state = {} |
137 state = {} |