branch | stable |
changeset 2546 | abe6dfbdc744 |
parent 2525 | 5adb8bdb935e |
child 2549 | 850b504d6472 |
--- a/hgext3rd/evolve/__init__.py Thu Jun 01 16:26:00 2017 +0200 +++ b/hgext3rd/evolve/__init__.py Tue Jun 06 15:10:13 2017 -0700 @@ -576,7 +576,7 @@ if reason == 'pruned': solvemsg = _("use 'hg evolve' to update to its parent successor") elif reason == 'diverged': - debugcommand = "hg evolve -list --divergent" + debugcommand = "hg evolve --list --divergent" basemsg = _("%s has diverged, use '%s' to resolve the issue") solvemsg = basemsg % (shortnode, debugcommand) elif reason == 'superseed':