Mercurial > evolve
comparison tests/test-exchange-obsmarkers-case-B2.t @ 3472:05bd493d496d
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 | 51a1dd295fe0 |
children | d166b3dc5e8a |
comparison
equal
deleted
inserted
replaced
3470:ece5cd58147d | 3472:05bd493d496d |
---|