Mercurial > evolve

diff tests/test-exchange-obsmarkers-case-C4.t @ 3472:05bd493d496d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: add evolve info to cmdutil.afterresolvedstates Adding evolve info to cmdutil.afterresolvedstate will improve the ui when we run into merge conflicts while evolving. Once we resolve all the conflicts using `hg resolve`, this will show a message saying "continue: hg evolve --continue". Other extensions like rebase and shelve also use it and it's very helpful.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 27 Jan 2018 21:15:27 +0530
parents 2e703ed1c713
children d166b3dc5e8a
line wrap: on
line diff