| Fri, 08 Jun 2018 18:32:48 +0530 | Pulkit Goyal | next-prev: add tests showing --merge not respected in some cases | changeset | files |
| Thu, 07 Jun 2018 22:59:39 +0530 | Pulkit Goyal | evolve: store the evolvestate if relocation results in conflicts | changeset | files |
| Thu, 07 Jun 2018 22:45:54 +0530 | Pulkit Goyal | tests: add more test of resolution of content-divergent changesets | changeset | files |
| Thu, 07 Jun 2018 18:18:10 +0530 | Pulkit Goyal | evolvestate: store info about relocation while resolving content-divergence | changeset | files |
| Thu, 07 Jun 2018 18:13:54 +0530 | Pulkit Goyal | evolve: factor out logic to merge content divergent csets in separate fn | changeset | files |
| Thu, 07 Jun 2018 20:27:03 +0530 | Pulkit Goyal | evolve: commit the transaction if conflicts occur while merging content-div | changeset | files |
| Thu, 07 Jun 2018 15:54:32 +0530 | Pulkit Goyal | tests: add tests for resolving content-divergence when different parents | changeset | files |