CHANGELOG
branchstable
changeset 4692 a9cf0ba6e6c7
parent 4689 27947b17cfaf
child 4702 fcecbb1261f2
equal deleted inserted replaced
4691:214dab733124 4692:a9cf0ba6e6c7
     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   * pick: properly report and cleanup "unfinished state"
     8   * evolve: properly prune changeset with no change in case of conflict (issue5967)
     9   * evolve: properly prune changeset with no change in case of conflict (issue5967)
     9 
    10 
    10 9.0.0 -- 2019-06-06
    11 9.0.0 -- 2019-06-06
    11 -------------------
    12 -------------------
    12 
    13