equal
deleted
inserted
replaced
19 == Bug Fixes == |
19 == Bug Fixes == |
20 |
20 |
21 |
21 |
22 == Backwards Compatibility Changes == |
22 == Backwards Compatibility Changes == |
23 |
23 |
|
24 * When `hg rebase` pauses for merge conflict resolution, the working |
|
25 copy will no longer have the rebased node as a second parent. You |
|
26 can use the new `conflictparents()` revset for finding the other |
|
27 parent during a conflict. |
|
28 |
24 |
29 |
25 == Internal API Changes == |
30 == Internal API Changes == |
26 |
31 |
27 * The deprecated `ui.progress()` has now been deleted. Please use |
32 * The deprecated `ui.progress()` has now been deleted. Please use |
28 `ui.makeprogress()` instead. |
33 `ui.makeprogress()` instead. |