Show More
@@ -4563,7 +4563,7 b' def resolve(ui, repo, *pats, **opts):' | |||||
4563 | if actioncount > 1: |
|
4563 | if actioncount > 1: | |
4564 | raise error.Abort(_("too many actions specified")) |
|
4564 | raise error.Abort(_("too many actions specified")) | |
4565 | elif (actioncount == 0 |
|
4565 | elif (actioncount == 0 | |
4566 | and ui.config('commands', 'resolve.explicit-re-merge')): |
|
4566 | and ui.configbool('commands', 'resolve.explicit-re-merge')): | |
4567 | hint = _('use --mark, --unmark, --list or --re-merge') |
|
4567 | hint = _('use --mark, --unmark, --list or --re-merge') | |
4568 | raise error.Abort(_('no action specified'), hint=hint) |
|
4568 | raise error.Abort(_('no action specified'), hint=hint) | |
4569 | if pats and all: |
|
4569 | if pats and all: |
General Comments 0
You need to be logged in to leave comments.
Login now