equal
deleted
inserted
replaced
5060 |
5060 |
5061 # Nudge users into finishing an unfinished operation. We don't print |
5061 # Nudge users into finishing an unfinished operation. We don't print |
5062 # this with the list/show operation because we want list/show to remain |
5062 # this with the list/show operation because we want list/show to remain |
5063 # machine readable. |
5063 # machine readable. |
5064 if not list(ms.unresolved()) and not show: |
5064 if not list(ms.unresolved()) and not show: |
5065 ui.status(_('no more unresolved files\n')) |
5065 ui.status(_('(no more unresolved files)\n')) |
5066 |
5066 |
5067 return ret |
5067 return ret |
5068 |
5068 |
5069 @command('revert', |
5069 @command('revert', |
5070 [('a', 'all', None, _('revert all changes when no arguments given')), |
5070 [('a', 'all', None, _('revert all changes when no arguments given')), |