586         msg = _('No unresolved merge conflicts.')

   586         msg = _('No unresolved merge conflicts.')

   587 

   587 

   588     return _commentlines(msg)

   588     return _commentlines(msg)

   589 

   589 

   590 def _helpmessage(continuecmd, abortcmd):

   590 def _helpmessage(continuecmd, abortcmd):

   593     return _commentlines(msg)

   593     return _commentlines(msg)

   594 

   594 

   595 def _rebasemsg():

   595 def _rebasemsg():

   596     return _helpmessage('hg rebase --continue', 'hg rebase --abort')

   596     return _helpmessage('hg rebase --continue', 'hg rebase --abort')

   597 

   597 

   601 def _unshelvemsg():

   601 def _unshelvemsg():

   602     return _helpmessage('hg unshelve --continue', 'hg unshelve --abort')

   602     return _helpmessage('hg unshelve --continue', 'hg unshelve --abort')

   603 

   603 

   604 def _updatecleanmsg(dest=None):

   604 def _updatecleanmsg(dest=None):

   605     warning = _('warning: this will discard uncommitted changes')

   605     warning = _('warning: this will discard uncommitted changes')

   607 

   607 

   608 def _graftmsg():

   608 def _graftmsg():

   609     # tweakdefaults requires `update` to have a rev hence the `.`

   609     # tweakdefaults requires `update` to have a rev hence the `.`

   610     return _helpmessage('hg graft --continue', _updatecleanmsg())

   610     return _helpmessage('hg graft --continue', _updatecleanmsg())

   611 

   611