equal
deleted
inserted
replaced
59 anymore. You can pass `--verify` or call `hg verify` if necessary. |
59 anymore. You can pass `--verify` or call `hg verify` if necessary. |
60 |
60 |
61 * `hg debugmergestate` output format changed. Let us know if that is |
61 * `hg debugmergestate` output format changed. Let us know if that is |
62 causing you problems and we'll roll it back. |
62 causing you problems and we'll roll it back. |
63 |
63 |
|
64 * Resolved merge conflicts are now cleared by `hg commit` even if the |
|
65 working copy has no changes. |
|
66 |
64 |
67 |
65 == Internal API Changes == |
68 == Internal API Changes == |
66 |
69 |
67 * The deprecated `ui.progress()` has now been deleted. Please use |
70 * The deprecated `ui.progress()` has now been deleted. Please use |
68 `ui.makeprogress()` instead. |
71 `ui.makeprogress()` instead. |