branch | stable |
changeset 15946 | b9c7ac405757 |
parent 15922 | 23921c17299a |
child 15948 | 536856769512 |
--- a/mercurial/phases.py Fri Jan 20 12:04:45 2012 -0200 +++ b/mercurial/phases.py Fri Jan 20 12:57:13 2012 -0200 @@ -276,7 +276,7 @@ phase = int(phase) if phase == 0: if node != nullid: - msg = _('ignoring inconsistense public root from remote: %s') + msg = _('ignoring inconsistent public root from remote: %s') repo.ui.warn(msg, nhex) elif phase == 1: if node in nodemap: