equal
deleted
inserted
replaced
152 (e.g. merges from the destination branch). |
152 (e.g. merges from the destination branch). |
153 |
153 |
154 Unlike ``merge``, rebase will do nothing if you are at the branch tip of |
154 Unlike ``merge``, rebase will do nothing if you are at the branch tip of |
155 a named branch with two heads. You will need to explicitly specify source |
155 a named branch with two heads. You will need to explicitly specify source |
156 and/or destination. |
156 and/or destination. |
|
157 |
|
158 If you need to use a tool to automate merge/conflict decisions, you |
|
159 can specify one with ``--tool``, see :hg:`help merge-tools`. |
157 |
160 |
158 If a rebase is interrupted to manually resolve a conflict, it can be |
161 If a rebase is interrupted to manually resolve a conflict, it can be |
159 continued with --continue/-c or aborted with --abort/-a. |
162 continued with --continue/-c or aborted with --abort/-a. |
160 |
163 |
161 .. container:: verbose |
164 .. container:: verbose |