| 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 |
| Fri, 01 Jun 2018 19:52:06 +0530 | Pulkit Goyal | evolve: implement resolution of content-divergence when on differet parents | changeset | files |
| Fri, 01 Jun 2018 19:57:19 +0530 | Pulkit Goyal | tests: add tests for resolving content-divergence with parent change | changeset | files |
| Wed, 06 Jun 2018 03:49:17 +0530 | Pulkit Goyal | CHANGELOG: add an entry about fixing issue5877 | changeset | files |
| Wed, 06 Jun 2018 03:26:47 +0530 | Pulkit Goyal | evolve: pop up editor if conflicts occur while merging commit messages | changeset | files |