changeset 19804 | 061ce98c888d |
parent 19730 | d184bae667e4 |
child 19867 | edce20ebe1f3 |
--- a/mercurial/cmdutil.py Mon Sep 23 20:53:14 2013 -0700 +++ b/mercurial/cmdutil.py Mon Sep 23 21:31:37 2013 -0700 @@ -84,7 +84,7 @@ raise util.Abort(_('outstanding uncommitted merge')) modified, added, removed, deleted = repo.status()[:4] if modified or added or removed or deleted: - raise util.Abort(_("outstanding uncommitted changes")) + raise util.Abort(_('uncommitted changes')) ctx = repo[None] for s in sorted(ctx.substate): if ctx.sub(s).dirty():