CHANGELOG
branchstable
changeset 4689 27947b17cfaf
parent 4687 313565dd75e3
child 4692 a9cf0ba6e6c7
equal deleted inserted replaced
4688:75329efe56a9 4689:27947b17cfaf
     3 
     3 
     4 9.0.1 - in progress
     4 9.0.1 - in progress
     5 -------------------
     5 -------------------
     6 
     6 
     7   * pick: no longer forget file in case of conflict (issue6037)
     7   * pick: no longer forget file in case of conflict (issue6037)
       
     8   * evolve: properly prune changeset with no change in case of conflict (issue5967)
     8 
     9 
     9 9.0.0 -- 2019-06-06
    10 9.0.0 -- 2019-06-06
    10 -------------------
    11 -------------------
    11 
    12 
    12   * evolve: preserve the working directory after resolving instability (BC)
    13   * evolve: preserve the working directory after resolving instability (BC)