equal
deleted
inserted
replaced
9 * pick: no longer forget file in case of conflict (issue6037), |
9 * pick: no longer forget file in case of conflict (issue6037), |
10 * pick: properly report and cleanup "unfinished state", |
10 * pick: properly report and cleanup "unfinished state", |
11 |
11 |
12 * prune: don't update wcp if pruned revision are unrelated (issue6137), |
12 * prune: don't update wcp if pruned revision are unrelated (issue6137), |
13 * prune: spell --successor flag without any unnecessary shortcuts, |
13 * prune: spell --successor flag without any unnecessary shortcuts, |
|
14 * prune: update to the successor of wdir also with --pair/--biject (issue6142) |
14 |
15 |
15 * evolve: properly prune changeset with no change in case of conflict (issue5967), |
16 * evolve: properly prune changeset with no change in case of conflict (issue5967), |
16 * evolve: use the same wording as core in case of unresolved conflict, |
17 * evolve: use the same wording as core in case of unresolved conflict, |
17 * evolve: minor output message improvements, |
18 * evolve: minor output message improvements, |
18 * evolve: improve `hg evolve --all` behavior when "." is obsolete, |
19 * evolve: improve `hg evolve --all` behavior when "." is obsolete, |