Sun, 29 Apr 2018 19:14:41 +0530 | Pulkit Goyal | evolve: show cset hash in "update to local conflict" message | changeset | files |
Sun, 29 Apr 2018 19:11:29 +0530 | Pulkit Goyal | evolve: use hg.updaterepo() instead of hg.update() to hide stats | changeset | files |
Sun, 29 Apr 2018 19:04:18 +0530 | Pulkit Goyal | evolve: fix the conflicts error message during content-divergence resolution | changeset | files |
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 |