Mercurial > evolve

diff tests/test-amend.t @ 3395:02192ac8ef98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: use better words in conflict markers of `hg evolve` Though we call merge.graft internally, we still have the functionality to pass the words we want to show up in conflict markers. So let's use better words here.
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 11 Jan 2018 18:36:05 +0530
parents b834cb64f779
children 85cdce113c2c 1f0c88a9dd1c
line wrap: on
line diff