branch | stable |
changeset 4687 | 313565dd75e3 |
parent 4665 | 756db65030c6 |
child 4689 | 27947b17cfaf |
4686:f1466f5ffbf5 | 4687:313565dd75e3 |
---|---|
1 Changelog |
1 Changelog |
2 ========= |
2 ========= |
3 |
|
4 9.0.1 - in progress |
|
5 ------------------- |
|
6 |
|
7 * pick: no longer forget file in case of conflict (issue6037) |
|
3 |
8 |
4 9.0.0 -- 2019-06-06 |
9 9.0.0 -- 2019-06-06 |
5 ------------------- |
10 ------------------- |
6 |
11 |
7 * evolve: preserve the working directory after resolving instability (BC) |
12 * evolve: preserve the working directory after resolving instability (BC) |