branch | stable |
changeset 1395 | 362e2c8c5677 |
parent 1392 | 0ec6cc5b4b7a |
child 1396 | ba95cec18fe9 |
child 1401 | 20ff4ef75b87 |
--- a/hgext/evolve.py Fri Jun 19 00:17:34 2015 -0700 +++ b/hgext/evolve.py Fri Jun 19 10:44:25 2015 -0700 @@ -1392,7 +1392,8 @@ repo.opener.write('graftstate', orig.hex() + '\n') repo.ui.write_err(_('evolve failed!\n')) repo.ui.write_err( - _('fix conflict and run "hg evolve --continue"\n')) + _('fix conflict and run "hg evolve --continue"' + ' or use "hg update -C" to abort\n')) raise def _solvebumped(ui, repo, bumped, dryrun=False, confirm=False,