evolve: revision graph

graph

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

tests: add tests for resolving content-divergence when different parents
Thu, 07 Jun 2018 15:54:32 +0530, by Pulkit Goyal
evolve: implement resolution of content-divergence when on differet parents
Fri, 01 Jun 2018 19:52:06 +0530, by Pulkit Goyal
tests: add tests for resolving content-divergence with parent change
Fri, 01 Jun 2018 19:57:19 +0530, by Pulkit Goyal
CHANGELOG: add an entry about fixing issue5877
Wed, 06 Jun 2018 03:49:17 +0530, by Pulkit Goyal
evolve: pop up editor if conflicts occur while merging commit messages
Wed, 06 Jun 2018 03:26:47 +0530, by Pulkit Goyal
evolve: merge commit messages while resolving content-divergence (issue5877)
Mon, 04 Jun 2018 01:28:02 +0530, by Pulkit Goyal

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