diff --git a/mercurial/commands.py b/mercurial/commands.py index f486001f9d6fc7dd161016eedfa68a42b7a2840a_bWVyY3VyaWFsL2NvbW1hbmRzLnB5..9209c02f1f2548045f37f4a0f617723079503028_bWVyY3VyaWFsL2NvbW1hbmRzLnB5 100644 --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -4994,8 +4994,8 @@ if pats and all: raise util.Abort(_("can't specify --all and patterns")) if not (all or pats or show or mark or unmark): - raise util.Abort(_('no files or directories specified; ' - 'use --all to remerge all files')) + raise util.Abort(_('no files or directories specified'), + hint=('use --all to remerge all files')) wlock = repo.wlock() try: diff --git a/tests/test-merge9.t b/tests/test-merge9.t index f486001f9d6fc7dd161016eedfa68a42b7a2840a_dGVzdHMvdGVzdC1tZXJnZTkudA==..9209c02f1f2548045f37f4a0f617723079503028_dGVzdHMvdGVzdC1tZXJnZTkudA== 100644 --- a/tests/test-merge9.t +++ b/tests/test-merge9.t @@ -76,7 +76,8 @@ resolve all warning $ hg resolve - abort: no files or directories specified; use --all to remerge all files + abort: no files or directories specified + (use --all to remerge all files) [255] resolve all