Mercurial > evolve
log
| age | author | description |
|---|---|---|
| Fri, 01 Jun 2018 19:52:06 +0530 | Pulkit Goyal | evolve: implement resolution of content-divergence when on differet parents |
| Fri, 01 Jun 2018 19:57:19 +0530 | Pulkit Goyal | tests: add tests for resolving content-divergence with parent change |
| Wed, 06 Jun 2018 03:49:17 +0530 | Pulkit Goyal | CHANGELOG: add an entry about fixing issue5877 |
| Wed, 06 Jun 2018 03:26:47 +0530 | Pulkit Goyal | evolve: pop up editor if conflicts occur while merging commit messages |
| Mon, 04 Jun 2018 01:28:02 +0530 | Pulkit Goyal | evolve: merge commit messages while resolving content-divergence (issue5877) |
| Wed, 06 Jun 2018 01:19:36 +0530 | Pulkit Goyal | evolve: move if-else block under the right block |
| Tue, 05 Jun 2018 22:02:24 +0530 | Pulkit Goyal | tests: make sure we don't result in commit messages conflict |