Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/rewriteutil.py
changeset 47019 c4dbbaecaad3
parent 47018 7a90fddb13b0
child 47020 ba6881c6a178 
--- a/mercurial/rewriteutil.py	Thu Feb 11 15:11:10 2021 -0800
+++ b/mercurial/rewriteutil.py	Wed Apr 28 08:48:10 2021 -0700
@@ -44,7 +44,7 @@
         revs = (r.rev() for r in revs)
 
     if len(repo[None].parents()) > 1:
-        raise error.StateError(_(b"cannot %s while merging") % action)
+        raise error.StateError(_(b"cannot %s changesets while merging") % action)
 
     publicrevs = repo.revs(b'%ld and public()', revs)
     if publicrevs:
Mercurial