branch | stable |
changeset 4692 | a9cf0ba6e6c7 |
parent 4689 | 27947b17cfaf |
child 4702 | fcecbb1261f2 |
--- a/CHANGELOG Fri Jun 14 18:14:57 2019 +0800 +++ b/CHANGELOG Fri Jun 14 18:17:03 2019 +0800 @@ -5,6 +5,7 @@ ------------------- * pick: no longer forget file in case of conflict (issue6037) + * pick: properly report and cleanup "unfinished state" * evolve: properly prune changeset with no change in case of conflict (issue5967) 9.0.0 -- 2019-06-06