equal
deleted
inserted
replaced
1 Changelog |
1 Changelog |
2 ========= |
2 ========= |
|
3 |
|
4 9.1.0 - in progress |
|
5 ------------------- |
|
6 |
|
7 * evolve: use the same wording as core in case of unresolved conflict |
|
8 * evolve: minor output message improvements |
|
9 * evolve: improve `hg evolve --all` behavior when "." is obsolete |
|
10 * topic: fix confusion in branch heads checking logic |
|
11 * touch: now works on merge commit too |
|
12 * rewind: fix behavior for merge commit |
|
13 * fold: allow fold with merge commit |
|
14 * metaedit: now also operates on merge commit |
3 |
15 |
4 9.0.1 - in progress |
16 9.0.1 - in progress |
5 ------------------- |
17 ------------------- |
6 |
18 |
7 * pick: no longer forget file in case of conflict (issue6037) |
19 * pick: no longer forget file in case of conflict (issue6037) |