Mercurial > evolve
log tests/test-evolve-content-divergence.t @ 3807:03ccdc753582
| age | author | description |
|---|---|---|
| Thu, 07 Jun 2018 20:27:03 +0530 | Pulkit Goyal | evolve: commit the transaction if conflicts occur while merging content-div |
| Thu, 07 Jun 2018 15:54:32 +0530 | Pulkit Goyal | tests: add tests for resolving content-divergence when different parents |
| 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: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) |
| Mon, 04 Jun 2018 04:03:02 +0530 | Pulkit Goyal | evolve: prompt user for branch selection while resolving content-divergence |