changeset 19801 | 41abe2e3e3b7 |
parent 19797 | a9abdb168425 |
child 19872 | 681f7b9213a4 |
--- a/mercurial/commands.py Mon Sep 23 20:08:52 2013 -0700 +++ b/mercurial/commands.py Mon Sep 23 20:33:02 2013 -0700 @@ -5850,7 +5850,7 @@ if check: c = repo[None] if c.dirty(merge=False, branch=False, missing=True): - raise util.Abort(_("uncommitted local changes")) + raise util.Abort(_("uncommitted changes")) if rev is None: rev = repo[repo[None].branch()].rev() mergemod._checkunknown(repo, repo[None], repo[rev])