Mercurial > evolve
log tests/test-evolve-content-divergence.t @ 3802:4bad80f1aad3
age | author | description |
---|---|---|
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 |