2018-06-07 Pulkit Goyal evolve: factor out logic to merge content divergent csets in separate fn
2018-06-07 Pulkit Goyal evolve: commit the transaction if conflicts occur while merging content-div
2018-06-07 Pulkit Goyal tests: add tests for resolving content-divergence when different parents
2018-06-01 Pulkit Goyal evolve: implement resolution of content-divergence when on differet parents
2018-06-01 Pulkit Goyal tests: add tests for resolving content-divergence with parent change
2018-06-05 Pulkit Goyal CHANGELOG: add an entry about fixing issue5877
2018-06-05 Pulkit Goyal evolve: pop up editor if conflicts occur while merging commit messages
2018-06-03 Pulkit Goyal evolve: merge commit messages while resolving content-divergence (issue5877)
2018-06-05 Pulkit Goyal evolve: move if-else block under the right block
2018-06-05 Pulkit Goyal tests: make sure we don't result in commit messages conflict
2018-06-05 Pulkit Goyal tests: don't use mkcommit shell function in test-divergent.t
2018-06-06 Pierre-Yves David evolve: remove duplicated documentation
Loading...
(0) -3000 -1000 -300 -100 -12 +12 +100 +300 +1000 tip