evolve: revision graph

graph

less more | rev 3738: (0) -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 tip

evolve: fix the conflicts error message during content-divergence resolution
Sun, 29 Apr 2018 19:04:18 +0530, by Pulkit Goyal
evolve: add logic to continue interrupted content-divergence resolution
Sun, 29 Apr 2018 18:51:56 +0530, by Pulkit Goyal
evolve: store the evolvestate file when encountering conflicts
Sun, 29 Apr 2018 18:48:36 +0530, by Pulkit Goyal

less more | rev 3738: (0) -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 tip