Sun, 29 Apr 2018 18:51:56 +0530 | Pulkit Goyal | evolve: add logic to continue interrupted content-divergence resolution | changeset | files |
Sun, 29 Apr 2018 18:48:36 +0530 | Pulkit Goyal | evolve: store the evolvestate file when encountering conflicts | changeset | files |
Sun, 29 Apr 2018 18:13:29 +0530 | Pulkit Goyal | evolve: take out logic to complete phase-divergence in separate fn | changeset | files |
Sun, 29 Apr 2018 17:54:01 +0530 | Pulkit Goyal | evolve: store divergent nodes in evolvestate when resolving content-divergence | changeset | files |
Wed, 02 May 2018 11:59:06 +0200 | Pierre-Yves David | branching: merge stable into default | changeset | files |
Sat, 28 Apr 2018 18:44:07 +0530 | Pulkit Goyal | tests: add test showing `hg evolve --stop` works fine with phase-divergence | changeset | files |