##// END OF EJS Templates
resolve: report no argument warning using a hint...
Nathan Goldbaum -
r21940:9209c02f stable
parent child Browse files
Show More
@@ -4994,8 +4994,8 b' def resolve(ui, repo, *pats, **opts):'
4994 if pats and all:
4994 if pats and all:
4995 raise util.Abort(_("can't specify --all and patterns"))
4995 raise util.Abort(_("can't specify --all and patterns"))
4996 if not (all or pats or show or mark or unmark):
4996 if not (all or pats or show or mark or unmark):
4997 raise util.Abort(_('no files or directories specified; '
4997 raise util.Abort(_('no files or directories specified'),
4998 'use --all to remerge all files'))
4998 hint=('use --all to remerge all files'))
4999
4999
5000 wlock = repo.wlock()
5000 wlock = repo.wlock()
5001 try:
5001 try:
@@ -76,7 +76,8 b' after resolve'
76
76
77 resolve all warning
77 resolve all warning
78 $ hg resolve
78 $ hg resolve
79 abort: no files or directories specified; use --all to remerge all files
79 abort: no files or directories specified
80 (use --all to remerge all files)
80 [255]
81 [255]
81
82
82 resolve all
83 resolve all
General Comments 0
You need to be logged in to leave comments. Login now