Mercurial > evolve

diff tests/test-exchange-obsmarkers-case-A1.t @ 3743:648552969e88 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: point to '--abort' in verbose status message f6979d64b9fb (evolve: point to '--abort' in error message, 2018-04-22) changed "hg update -C ." to "hg evolve --abort" in error messages. This commit makes the same change in the verbose status message (the one that warns about unfinished evolve). There's still one mention "hg update -C" in our codebase. That's after "hg evolve --content-divergent" fails, but I don't think "hg evolve --abort" works in that case (yet?).
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 10 May 2018 21:37:28 -0700
parents 8feb2cae7eae
children ccfcacc5ee7c ef22eef37ecc
line wrap: on
line diff