equal
deleted
inserted
replaced
1492 hint="| %(d)s, %(o)s are not based on the same changeset.\n" |
1492 hint="| %(d)s, %(o)s are not based on the same changeset.\n" |
1493 "| With the current state of its implementation, \n" |
1493 "| With the current state of its implementation, \n" |
1494 "| evolve does not work in that case.\n" |
1494 "| evolve does not work in that case.\n" |
1495 "| rebase one of them next to the other and run \n" |
1495 "| rebase one of them next to the other and run \n" |
1496 "| this command again.\n" |
1496 "| this command again.\n" |
1497 "| - either: hg rebase -dest 'p1(%(d)s)' -r %(o)s\n" |
1497 "| - either: hg rebase --dest 'p1(%(d)s)' -r %(o)s\n" |
1498 "| - or: hg rebase -dest 'p1(%(d)s)' -r %(o)s" |
1498 "| - or: hg rebase --dest 'p1(%(o)s)' -r %(d)s" |
1499 % {'d': divergent, 'o': other}) |
1499 % {'d': divergent, 'o': other}) |
1500 |
1500 |
1501 displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate}) |
1501 displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate}) |
1502 if not ui.quiet or confirm: |
1502 if not ui.quiet or confirm: |
1503 ui.write(_('merge:')) |
1503 ui.write(_('merge:')) |