author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
Fri, 21 Jul 2006 02:31:59 +0200 | |
changeset 2648 | f47432ae5376 |
parent 2647 | 46182568b4ce |
child 2649 | 3b53fa20dda8 |
--- a/mercurial/commands.py Fri Jul 21 01:40:07 2006 +0200 +++ b/mercurial/commands.py Fri Jul 21 02:31:59 2006 +0200 @@ -2675,7 +2675,7 @@ if p1 == nullid: raise util.Abort(_('no revision to tag')) if p2 != nullid: - raise util.Abort(_('outstanding uncommited merges')) + raise util.Abort(_('outstanding uncommitted merges')) r = hex(p1) repo.tag(name, r, opts['local'], opts['message'], opts['user'],