Mercurial > hg-stable
changeset 26352:e635bc9bb7d9
resolve: consistently describe re-merge + unresolved
| author | timeless@mozdev.org |
|---|---|
| date | Fri, 25 Sep 2015 03:51:46 -0400 |
| parents | 8c7d8d5e1e0f |
| children | 7c20d501709b |
| files | mercurial/commands.py tests/test-merge9.t tests/test-resolve.t |
| diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Thu Sep 10 16:53:07 2015 +0200 +++ b/mercurial/commands.py Fri Sep 25 03:51:46 2015 -0400 @@ -5459,7 +5459,7 @@ 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'), - hint=('use --all to remerge all files')) + hint=('use --all to re-merge all unresolved files')) if show: fm = ui.formatter('resolve', opts)
--- a/tests/test-merge9.t Thu Sep 10 16:53:07 2015 +0200 +++ b/tests/test-merge9.t Fri Sep 25 03:51:46 2015 -0400 @@ -77,7 +77,7 @@ resolve all warning $ hg resolve abort: no files or directories specified - (use --all to remerge all files) + (use --all to re-merge all unresolved files) [255] resolve all
--- a/tests/test-resolve.t Thu Sep 10 16:53:07 2015 +0200 +++ b/tests/test-resolve.t Fri Sep 25 03:51:46 2015 -0400 @@ -129,7 +129,7 @@ resolve without arguments should suggest --all $ hg resolve abort: no files or directories specified - (use --all to remerge all files) + (use --all to re-merge all unresolved files) [255] resolve --all should re-merge all unresolved files