evolve: revision graph

graph

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

changelog: add a changelog entry about divergence resolution
Thu, 14 Jun 2018 02:58:30 +0200, by Pierre-Yves David
evolve: create resolved cset on successors of current parents
Thu, 14 Jun 2018 01:39:33 +0530, by Pulkit Goyal
tests: fix a test case to not create conflicts
Thu, 14 Jun 2018 01:39:11 +0530, by Pulkit Goyal
evolve: introduce a resolutionparent variable and store it in evolvestate
Thu, 14 Jun 2018 01:06:12 +0530, by Pulkit Goyal

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