Submitter | phabricator |
---|---|
Date | Feb. 28, 2018, 10:29 p.m. |
Message ID | <differential-rev-PHID-DREV-3cfn7dqu4gglgez3swwg-req@phab.mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/28503/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -1036,7 +1036,7 @@ return nullrev if len(parents) == 1: return parents.pop() - raise error.Abort(_('unable to collapse on top of %s, there is more ' + raise error.Abort(_('unable to collapse on top of %d, there is more ' 'than one external parent: %s') % (max(destancestors), ', '.join("%d" % p for p in sorted(parents))))