CHANGELOG
branchstable
changeset 4702 fcecbb1261f2
parent 4692 a9cf0ba6e6c7
child 4706 de194ed973ba
child 4728 ef8907df73fc
equal deleted inserted replaced
4701:1b5da965d72a 4702:fcecbb1261f2
     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   * pick: properly report and cleanup "unfinished state"
       
     9   * prune: don't update wcp if pruned revision are unrelated (issue6137)
     9   * evolve: properly prune changeset with no change in case of conflict (issue5967)
    10   * evolve: properly prune changeset with no change in case of conflict (issue5967)
    10 
    11 
    11 9.0.0 -- 2019-06-06
    12 9.0.0 -- 2019-06-06
    12 -------------------
    13 -------------------
    13 
    14