evolve: revision graph

graph

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

evolve: commit the transaction if conflicts occur while merging content-div
Thu, 07 Jun 2018 20:27:03 +0530, by Pulkit Goyal
tests: add tests for resolving content-divergence when different parents
Thu, 07 Jun 2018 15:54:32 +0530, by Pulkit Goyal

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